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 2009/04/11 03:03:25 UTC
svn commit: r764131 [3/16] - in /directory: apacheds/trunk/
apacheds/trunk/core-avl/
apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/
apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/
apached...
Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java Sat Apr 11 01:03:00 2009
@@ -36,7 +36,6 @@
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.IndexCursor;
import org.apache.directory.server.xdbm.tools.StoreUtils;
-import org.apache.directory.server.core.cursor.Cursor;
import org.apache.directory.server.core.entry.ServerEntry;
import org.apache.directory.server.core.entry.ServerModification;
import org.apache.directory.server.core.entry.DefaultServerAttribute;
@@ -44,6 +43,7 @@
import org.apache.directory.server.constants.ApacheSchemaConstants;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.cursor.Cursor;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.entry.Modification;
Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTableWithDuplicatesTest.java Sat Apr 11 01:03:00 2009
@@ -28,9 +28,9 @@
import org.apache.directory.server.xdbm.Table;
import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.core.cursor.Cursor;
import org.apache.directory.server.schema.SerializableComparator;
import org.apache.directory.server.schema.registries.ComparatorRegistry;
+import org.apache.directory.shared.ldap.cursor.Cursor;
import org.apache.directory.shared.ldap.schema.parsers.ComparatorDescription;
import java.io.File;
Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursorTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleAvlCursorTest.java Sat Apr 11 01:03:00 2009
@@ -25,8 +25,8 @@
import java.util.Comparator;
import org.apache.directory.server.core.avltree.AvlTree;
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
import org.apache.directory.server.xdbm.Tuple;
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
import org.junit.Before;
import org.junit.Test;
Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleBTreeCursorTest.java Sat Apr 11 01:03:00 2009
@@ -34,10 +34,10 @@
import jdbm.helper.IntegerSerializer;
import jdbm.recman.BaseRecordManager;
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
import org.apache.directory.server.schema.SerializableComparator;
import org.apache.directory.server.schema.registries.ComparatorRegistry;
import org.apache.directory.server.xdbm.Tuple;
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.schema.parsers.ComparatorDescription;
import org.junit.After;
import org.junit.Before;
Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java (original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/NoDupsCursorTest.java Sat Apr 11 01:03:00 2009
@@ -23,10 +23,10 @@
import org.slf4j.LoggerFactory;
import org.apache.directory.server.xdbm.Table;
import org.apache.directory.server.xdbm.Tuple;
-import org.apache.directory.server.core.cursor.Cursor;
-import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
import org.apache.directory.server.schema.SerializableComparator;
import org.apache.directory.server.schema.registries.ComparatorRegistry;
+import org.apache.directory.shared.ldap.cursor.Cursor;
+import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
import org.apache.directory.shared.ldap.schema.parsers.ComparatorDescription;
import org.junit.Before;
import org.junit.After;
Propchange: directory/apacheds/trunk/ldap-api-test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 11 01:03:00 2009
@@ -0,0 +1,4 @@
+target
+.classpath
+.project
+.settings
Copied: directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (from r764110, directory/apacheds/branches/apacheds-replication/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?p2=directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java&p1=directory/apacheds/branches/apacheds-replication/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java&r1=764110&r2=764131&rev=764131&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (original)
+++ directory/apacheds/trunk/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Sat Apr 11 01:03:00 2009
@@ -61,15 +61,6 @@
try
{
- assertTrue( connection.connect() );
- }
- catch ( IOException ioe )
- {
- fail();
- }
-
- try
- {
BindResponse bindResponse = connection.bind( "uid=admin,ou=system", "secret" );
assertNotNull( bindResponse );
Modified: directory/apacheds/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/pom.xml?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/pom.xml (original)
+++ directory/apacheds/trunk/pom.xml Sat Apr 11 01:03:00 2009
@@ -352,7 +352,6 @@
<module>core-unit</module>
<module>core-integ</module>
<module>core-entry</module>
- <module>core-cursor</module>
<module>core-splay</module>
<module>core-avl</module>
<module>protocol-shared</module>
@@ -378,11 +377,10 @@
<module>kerberos-shared</module>
<!--module>kerberos-unit</module-->
<module>interceptor-kerberos</module>
- <!--
- <module>mitosis</module>
- -->
+ <!--module>syncrepl</module-->
<module>server-replication</module>
<module>xbean-spring</module>
+ <module>ldap-api-test</module>
</modules>
<reporting>
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,7 @@
import java.util.Set;
-import org.apache.directory.shared.ldap.message.ExtendedRequest;
+import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
/**
@@ -61,7 +61,7 @@
*
* @throws Exception if failed to handle the operation
*/
- void handleExtendedOperation( LdapSession session, ExtendedRequest req ) throws Exception;
+ void handleExtendedOperation( LdapSession session, InternalExtendedRequest req ) throws Exception;
/**
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java Sat Apr 11 01:03:00 2009
@@ -22,14 +22,14 @@
import javax.naming.ldap.Control;
-import org.apache.directory.shared.ldap.message.ExtendedRequest;
+import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
-import org.apache.directory.shared.ldap.message.MutableControl;
-import org.apache.directory.shared.ldap.message.Request;
+import org.apache.directory.shared.ldap.message.InternalControl;
+import org.apache.directory.shared.ldap.message.InternalRequest;
import org.apache.directory.shared.ldap.message.ResponseCarryingMessageException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.ResultResponse;
-import org.apache.directory.shared.ldap.message.ResultResponseRequest;
+import org.apache.directory.shared.ldap.message.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.InternalResultResponseRequest;
import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.ssl.SslFilter;
@@ -42,7 +42,7 @@
* The MINA IoHandler implementation extending {@link DemuxingIoHandler} for
* the LDAP protocol. THe {@link LdapService} creates this multiplexing
* {@link IoHandler} handler and populates it with subordinate handlers for
- * the various kinds of LDAP {@link Request} messages. This is done in the
+ * the various kinds of LDAP {@link InternalRequest} messages. This is done in the
* setXxxHandler() methods of the LdapService where Xxxx is Add, Modify, etc.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -161,28 +161,28 @@
if ( message == SslFilter.SESSION_SECURED )
{
- ExtendedRequest req = new ExtendedRequestImpl( 0 );
+ InternalExtendedRequest req = new ExtendedRequestImpl( 0 );
req.setOid( "1.3.6.1.4.1.1466.20037" );
req.setPayload( "SECURED".getBytes( "ISO-8859-1" ) );
message = req;
}
else if ( message == SslFilter.SESSION_UNSECURED )
{
- ExtendedRequest req = new ExtendedRequestImpl( 0 );
+ InternalExtendedRequest req = new ExtendedRequestImpl( 0 );
req.setOid( "1.3.6.1.4.1.1466.20037" );
req.setPayload( "UNSECURED".getBytes( "ISO-8859-1" ) );
message = req;
}
- if ( ( ( Request ) message ).getControls().size() > 0 && message instanceof ResultResponseRequest )
+ if ( ( ( InternalRequest ) message ).getControls().size() > 0 && message instanceof InternalResultResponseRequest )
{
- ResultResponseRequest req = ( ResultResponseRequest ) message;
+ InternalResultResponseRequest req = ( InternalResultResponseRequest ) message;
for ( Control control1 : req.getControls().values() )
{
- MutableControl control = ( MutableControl ) control1;
+ InternalControl control = ( InternalControl ) control1;
if ( control.isCritical() && ! ldapService.getSupportedControls().contains( control.getID() ) )
{
- ResultResponse resp = req.getResultResponse();
+ InternalResultResponse resp = req.getResultResponse();
resp.getLdapResult().setErrorMessage( "Unsupport critical control: " + control.getID() );
resp.getLdapResult().setResultCode( ResultCodeEnum.UNAVAILABLE_CRITICAL_EXTENSION );
session.write( resp );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java Sat Apr 11 01:03:00 2009
@@ -21,8 +21,8 @@
import org.apache.directory.server.core.interceptor.context.OperationContext;
-import org.apache.directory.shared.ldap.message.Request;
-import org.apache.directory.shared.ldap.message.Response;
+import org.apache.directory.shared.ldap.message.InternalRequest;
+import org.apache.directory.shared.ldap.message.InternalResponse;
/**
@@ -40,7 +40,7 @@
* @param opContext the context to populate with request controls
* @param request the request to extract controls from
*/
- public static void setRequestControls( OperationContext opContext, Request request ) throws Exception
+ public static void setRequestControls( OperationContext opContext, InternalRequest request ) throws Exception
{
if ( request.getControls() != null )
{
@@ -56,7 +56,7 @@
* @param opContext the context to extract controls from
* @param response the response to populate with response controls
*/
- public static void setResponseControls( OperationContext opContext, Response response ) throws Exception
+ public static void setResponseControls( OperationContext opContext, InternalResponse response ) throws Exception
{
opContext.addRequestControls( opContext.getResponseControls() );
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapService.java Sat Apr 11 01:03:00 2009
@@ -51,19 +51,20 @@
import org.apache.directory.server.ldap.handlers.UnbindHandler;
import org.apache.directory.server.ldap.handlers.bind.MechanismHandler;
import org.apache.directory.server.ldap.handlers.ssl.LdapsInitializer;
+import org.apache.directory.server.ldap.replication.ReplicationSystem;
import org.apache.directory.server.protocol.shared.DirectoryBackedService;
import org.apache.directory.shared.ldap.constants.SaslQoP;
import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
-import org.apache.directory.shared.ldap.message.AbandonRequest;
-import org.apache.directory.shared.ldap.message.AddRequest;
-import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.DeleteRequest;
-import org.apache.directory.shared.ldap.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.UnbindRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonRequest;
+import org.apache.directory.shared.ldap.message.InternalAddRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.InternalCompareRequest;
+import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
+import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalModifyRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
import org.apache.directory.shared.ldap.message.control.CascadeControl;
import org.apache.directory.shared.ldap.message.control.EntryChangeControl;
import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
@@ -95,9 +96,9 @@
* An LDAP protocol provider implementation which dynamically associates
* handlers.
*
+ * @org.apache.xbean.XBean
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 688548 $
- * @org.apache.xbean.XBean
*/
public class LdapService extends DirectoryBackedService
{
@@ -183,16 +184,16 @@
private List<String> saslRealms;
/** The potocol handlers */
- private LdapRequestHandler<AbandonRequest> abandonHandler;
- private LdapRequestHandler<AddRequest> addHandler;
- private LdapRequestHandler<BindRequest> bindHandler;
- private LdapRequestHandler<CompareRequest> compareHandler;
- private LdapRequestHandler<DeleteRequest> deleteHandler;
- private LdapRequestHandler<ExtendedRequest> extendedHandler;
- private LdapRequestHandler<ModifyRequest> modifyHandler;
- private LdapRequestHandler<ModifyDnRequest> modifyDnHandler;
- private LdapRequestHandler<SearchRequest> searchHandler;
- private LdapRequestHandler<UnbindRequest> unbindHandler;
+ private LdapRequestHandler<InternalAbandonRequest> abandonHandler;
+ private LdapRequestHandler<InternalAddRequest> addHandler;
+ private LdapRequestHandler<InternalBindRequest> bindHandler;
+ private LdapRequestHandler<InternalCompareRequest> compareHandler;
+ private LdapRequestHandler<InternalDeleteRequest> deleteHandler;
+ private LdapRequestHandler<InternalExtendedRequest> extendedHandler;
+ private LdapRequestHandler<InternalModifyRequest> modifyHandler;
+ private LdapRequestHandler<InternalModifyDnRequest> modifyDnHandler;
+ private LdapRequestHandler<InternalSearchRequest> searchHandler;
+ private LdapRequestHandler<InternalUnbindRequest> unbindHandler;
/** the underlying provider codec factory */
@@ -210,6 +211,8 @@
*/
private boolean confidentialityRequired;
+
+ private ReplicationSystem replicationSystem;
/**
* Creates an LDAP protocol provider.
@@ -360,7 +363,8 @@
// We use the same number of thread than the number of IoProcessor
// (NOTE : this has to be double checked)
((DefaultIoFilterChainBuilder)chain).addLast( "executor",
- new ExecutorFilter( new OrderedThreadPoolExecutor( getTcpTransport().getNbThreads() ) ) ); //,
+ new ExecutorFilter(
+ new OrderedThreadPoolExecutor( getTcpTransport().getNbThreads() ) ) );
/*
* The server is now initialized, we can
@@ -940,7 +944,7 @@
}
- public MessageHandler<AbandonRequest> getAbandonHandler()
+ public MessageHandler<InternalAbandonRequest> getAbandonHandler()
{
return abandonHandler;
}
@@ -950,16 +954,16 @@
* @org.apache.xbean.Property hidden="true"
* @param abandonHandler The AbandonRequest handler
*/
- public void setAbandonHandler( LdapRequestHandler<AbandonRequest> abandonHandler )
+ public void setAbandonHandler( LdapRequestHandler<InternalAbandonRequest> abandonHandler )
{
- this.handler.removeReceivedMessageHandler( AbandonRequest.class );
+ this.handler.removeReceivedMessageHandler( InternalAbandonRequest.class );
this.abandonHandler = abandonHandler;
this.abandonHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( AbandonRequest.class, this.abandonHandler );
+ this.handler.addReceivedMessageHandler( InternalAbandonRequest.class, this.abandonHandler );
}
- public LdapRequestHandler<AddRequest> getAddHandler()
+ public LdapRequestHandler<InternalAddRequest> getAddHandler()
{
return addHandler;
}
@@ -969,16 +973,16 @@
* @org.apache.xbean.Property hidden="true"
* @param abandonHandler The AddRequest handler
*/
- public void setAddHandler( LdapRequestHandler<AddRequest> addHandler )
+ public void setAddHandler( LdapRequestHandler<InternalAddRequest> addHandler )
{
- this.handler.removeReceivedMessageHandler( AddRequest.class );
+ this.handler.removeReceivedMessageHandler( InternalAddRequest.class );
this.addHandler = addHandler;
this.addHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( AddRequest.class, this.addHandler );
+ this.handler.addReceivedMessageHandler( InternalAddRequest.class, this.addHandler );
}
- public LdapRequestHandler<BindRequest> getBindHandler()
+ public LdapRequestHandler<InternalBindRequest> getBindHandler()
{
return bindHandler;
}
@@ -988,17 +992,17 @@
* @org.apache.xbean.Property hidden="true"
* @param abandonHandler The BindRequest handler
*/
- public void setBindHandler( LdapRequestHandler<BindRequest> bindHandler )
+ public void setBindHandler( LdapRequestHandler<InternalBindRequest> bindHandler )
{
this.bindHandler = bindHandler;
this.bindHandler.setLdapServer( this );
- handler.removeReceivedMessageHandler( BindRequest.class );
- handler.addReceivedMessageHandler( BindRequest.class, this.bindHandler );
+ handler.removeReceivedMessageHandler( InternalBindRequest.class );
+ handler.addReceivedMessageHandler( InternalBindRequest.class, this.bindHandler );
}
- public LdapRequestHandler<CompareRequest> getCompareHandler()
+ public LdapRequestHandler<InternalCompareRequest> getCompareHandler()
{
return compareHandler;
}
@@ -1008,16 +1012,16 @@
* @org.apache.xbean.Property hidden="true"
* @param abandonHandler The CompareRequest handler
*/
- public void setCompareHandler( LdapRequestHandler<CompareRequest> compareHandler )
+ public void setCompareHandler( LdapRequestHandler<InternalCompareRequest> compareHandler )
{
- this.handler.removeReceivedMessageHandler( CompareRequest.class );
+ this.handler.removeReceivedMessageHandler( InternalCompareRequest.class );
this.compareHandler = compareHandler;
this.compareHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( CompareRequest.class, this.compareHandler );
+ this.handler.addReceivedMessageHandler( InternalCompareRequest.class, this.compareHandler );
}
- public LdapRequestHandler<DeleteRequest> getDeleteHandler()
+ public LdapRequestHandler<InternalDeleteRequest> getDeleteHandler()
{
return deleteHandler;
}
@@ -1027,16 +1031,16 @@
* @org.apache.xbean.Property hidden="true"
* @param abandonHandler The DeleteRequest handler
*/
- public void setDeleteHandler( LdapRequestHandler<DeleteRequest> deleteHandler )
+ public void setDeleteHandler( LdapRequestHandler<InternalDeleteRequest> deleteHandler )
{
- this.handler.removeReceivedMessageHandler( DeleteRequest.class );
+ this.handler.removeReceivedMessageHandler( InternalDeleteRequest.class );
this.deleteHandler = deleteHandler;
this.deleteHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( DeleteRequest.class, this.deleteHandler );
+ this.handler.addReceivedMessageHandler( InternalDeleteRequest.class, this.deleteHandler );
}
- public LdapRequestHandler<ExtendedRequest> getExtendedHandler()
+ public LdapRequestHandler<InternalExtendedRequest> getExtendedHandler()
{
return extendedHandler;
}
@@ -1046,16 +1050,16 @@
* @org.apache.xbean.Property hidden="true"
* @param abandonHandler The ExtendedRequest handler
*/
- public void setExtendedHandler( LdapRequestHandler<ExtendedRequest> extendedHandler )
+ public void setExtendedHandler( LdapRequestHandler<InternalExtendedRequest> extendedHandler )
{
- this.handler.removeReceivedMessageHandler( ExtendedRequest.class );
+ this.handler.removeReceivedMessageHandler( InternalExtendedRequest.class );
this.extendedHandler = extendedHandler;
this.extendedHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( ExtendedRequest.class, this.extendedHandler );
+ this.handler.addReceivedMessageHandler( InternalExtendedRequest.class, this.extendedHandler );
}
- public LdapRequestHandler<ModifyRequest> getModifyHandler()
+ public LdapRequestHandler<InternalModifyRequest> getModifyHandler()
{
return modifyHandler;
}
@@ -1065,16 +1069,16 @@
* @org.apache.xbean.Property hidden="true"
* @param abandonHandler The ModifyRequest handler
*/
- public void setModifyHandler( LdapRequestHandler<ModifyRequest> modifyHandler )
+ public void setModifyHandler( LdapRequestHandler<InternalModifyRequest> modifyHandler )
{
- this.handler.removeReceivedMessageHandler( ModifyRequest.class );
+ this.handler.removeReceivedMessageHandler( InternalModifyRequest.class );
this.modifyHandler = modifyHandler;
this.modifyHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( ModifyRequest.class, this.modifyHandler );
+ this.handler.addReceivedMessageHandler( InternalModifyRequest.class, this.modifyHandler );
}
- public LdapRequestHandler<ModifyDnRequest> getModifyDnHandler()
+ public LdapRequestHandler<InternalModifyDnRequest> getModifyDnHandler()
{
return modifyDnHandler;
}
@@ -1084,16 +1088,16 @@
* @org.apache.xbean.Property hidden="true"
* @param abandonHandler The ModifyDNRequest handler
*/
- public void setModifyDnHandler( LdapRequestHandler<ModifyDnRequest> modifyDnHandler )
+ public void setModifyDnHandler( LdapRequestHandler<InternalModifyDnRequest> modifyDnHandler )
{
- this.handler.removeReceivedMessageHandler( ModifyDnRequest.class );
+ this.handler.removeReceivedMessageHandler( InternalModifyDnRequest.class );
this.modifyDnHandler = modifyDnHandler;
this.modifyDnHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( ModifyDnRequest.class, this.modifyDnHandler );
+ this.handler.addReceivedMessageHandler( InternalModifyDnRequest.class, this.modifyDnHandler );
}
- public LdapRequestHandler<SearchRequest> getSearchHandler()
+ public LdapRequestHandler<InternalSearchRequest> getSearchHandler()
{
return searchHandler;
}
@@ -1103,16 +1107,16 @@
* @org.apache.xbean.Property hidden="true"
* @param abandonHandler The SearchRequest handler
*/
- public void setSearchHandler( LdapRequestHandler<SearchRequest> searchHandler )
+ public void setSearchHandler( LdapRequestHandler<InternalSearchRequest> searchHandler )
{
- this.handler.removeReceivedMessageHandler( SearchRequest.class );
+ this.handler.removeReceivedMessageHandler( InternalSearchRequest.class );
this.searchHandler = searchHandler;
this.searchHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( SearchRequest.class, this.searchHandler );
+ this.handler.addReceivedMessageHandler( InternalSearchRequest.class, this.searchHandler );
}
- public LdapRequestHandler<UnbindRequest> getUnbindHandler()
+ public LdapRequestHandler<InternalUnbindRequest> getUnbindHandler()
{
return unbindHandler;
}
@@ -1132,12 +1136,12 @@
* @org.apache.xbean.Property hidden="true"
* @param abandonHandler The UnbindRequest handler
*/
- public void setUnbindHandler( LdapRequestHandler<UnbindRequest> unbindHandler )
+ public void setUnbindHandler( LdapRequestHandler<InternalUnbindRequest> unbindHandler )
{
- this.handler.removeReceivedMessageHandler( UnbindRequest.class );
+ this.handler.removeReceivedMessageHandler( InternalUnbindRequest.class );
this.unbindHandler = unbindHandler;
this.unbindHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( UnbindRequest.class, this.unbindHandler );
+ this.handler.addReceivedMessageHandler( InternalUnbindRequest.class, this.unbindHandler );
}
@@ -1192,4 +1196,22 @@
{
this.certificatePassword = certificatePassword;
}
+
+
+ /**
+ * @param replicationSystem the replicationSystem to set
+ */
+ public void setReplicationSystem( ReplicationSystem replicationSystem )
+ {
+ this.replicationSystem = replicationSystem;
+ }
+
+
+ /**
+ * @return the replicationSystem
+ */
+ public ReplicationSystem getReplicationSystem()
+ {
+ return replicationSystem;
+ }
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java Sat Apr 11 01:03:00 2009
@@ -30,7 +30,7 @@
import org.apache.directory.server.core.authn.LdapPrincipal;
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.ldap.handlers.controls.PagedSearchContext;
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
import org.apache.directory.shared.ldap.message.BindStatus;
import org.apache.mina.core.session.IoSession;
import org.slf4j.Logger;
@@ -53,7 +53,7 @@
private static final boolean IS_DEBUG = LOG.isDebugEnabled();
/** The list of requests we can abandon */
- private static final AbandonableRequest[] EMPTY_ABANDONABLES = new AbandonableRequest[0];
+ private static final InternalAbandonableRequest[] EMPTY_ABANDONABLES = new InternalAbandonableRequest[0];
/** A lock to protect the abandonableRequests against concurrent access */
private final String outstandingLock;
@@ -71,7 +71,7 @@
private LdapService ldapService;
/** A map of all the running requests */
- private Map<Integer, AbandonableRequest> outstandingRequests;
+ private Map<Integer, InternalAbandonableRequest> outstandingRequests;
/** The current Bind status */
private BindStatus bindStatus;
@@ -98,7 +98,7 @@
{
this.ioSession = ioSession;
outstandingLock = "OutstandingRequestLock: " + ioSession.toString();
- outstandingRequests = new ConcurrentHashMap<Integer, AbandonableRequest>();
+ outstandingRequests = new ConcurrentHashMap<Integer, InternalAbandonableRequest>();
bindStatus = BindStatus.ANONYMOUS;
saslProperties = new HashMap<String, Object>();
pagedSearchContexts = new HashMap<Integer, PagedSearchContext>();
@@ -185,9 +185,9 @@
{
synchronized ( outstandingLock )
{
- AbandonableRequest[] abandonables = outstandingRequests.values().toArray( EMPTY_ABANDONABLES );
+ InternalAbandonableRequest[] abandonables = outstandingRequests.values().toArray( EMPTY_ABANDONABLES );
- for ( AbandonableRequest abandonable : abandonables )
+ for ( InternalAbandonableRequest abandonable : abandonables )
{
abandonOutstandingRequest( abandonable.getMessageId() );
}
@@ -200,9 +200,9 @@
*
* @param messageId The request ID to abandon
*/
- public AbandonableRequest abandonOutstandingRequest( int messageId )
+ public InternalAbandonableRequest abandonOutstandingRequest( int messageId )
{
- AbandonableRequest request = null;
+ InternalAbandonableRequest request = null;
synchronized ( outstandingLock )
{
@@ -237,7 +237,7 @@
*
* @param request an outstanding request that can be abandoned
*/
- public void registerOutstandingRequest( AbandonableRequest request )
+ public void registerOutstandingRequest( InternalAbandonableRequest request )
{
synchronized( outstandingLock )
{
@@ -251,7 +251,7 @@
*
* @param request the request to unregister
*/
- public void unregisterOutstandingRequest( AbandonableRequest request )
+ public void unregisterOutstandingRequest( InternalAbandonableRequest request )
{
synchronized( outstandingLock )
{
@@ -263,7 +263,7 @@
/**
* @return A list of all the abandonable requests for this session.
*/
- public Map<Integer, AbandonableRequest> getOutstandingRequests()
+ public Map<Integer, InternalAbandonableRequest> getOutstandingRequests()
{
synchronized( outstandingLock )
{
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java Sat Apr 11 01:03:00 2009
@@ -33,7 +33,7 @@
import org.apache.directory.server.ldap.LdapService;
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
import javax.swing.JTextArea;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
@@ -42,7 +42,7 @@
public class OutstandingRequestsDialog extends JDialog
{
private static final long serialVersionUID = -3777123348215825711L;
- private static final AbandonableRequest[] EMPTY_REQUEST_ARRAY = new AbandonableRequest[0];
+ private static final InternalAbandonableRequest[] EMPTY_REQUEST_ARRAY = new InternalAbandonableRequest[0];
private JPanel jContentPane;
private JPanel jPanel;
private JScrollPane jScrollPane;
@@ -164,7 +164,7 @@
if ( row > -1 )
{
jButton2.setEnabled( true );
- AbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel() )
+ InternalAbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel() )
.getAbandonableRequest( row );
jTextArea.setText( req.toString() );
jTextArea.setEnabled( true );
@@ -183,14 +183,14 @@
private void setRequestsModel()
{
- AbandonableRequest[] requests;
- Map<Integer, AbandonableRequest> reqsMap = session.getOutstandingRequests();
+ InternalAbandonableRequest[] requests;
+ Map<Integer, InternalAbandonableRequest> reqsMap = session.getOutstandingRequests();
if ( reqsMap != null )
{
- requests = new AbandonableRequest[reqsMap.size()];
+ requests = new InternalAbandonableRequest[reqsMap.size()];
//noinspection unchecked
- requests = ( AbandonableRequest[] ) reqsMap.values().toArray( requests );
+ requests = ( InternalAbandonableRequest[] ) reqsMap.values().toArray( requests );
}
else
{
@@ -324,7 +324,7 @@
public void actionPerformed( java.awt.event.ActionEvent e )
{
int row = jTable.getSelectedRow();
- AbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel() )
+ InternalAbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel() )
.getAbandonableRequest( row );
req.abandon();
session.abandonOutstandingRequest( req.getMessageId() );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java Sat Apr 11 01:03:00 2009
@@ -23,7 +23,7 @@
import javax.swing.event.TableModelListener;
import javax.swing.table.TableModel;
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
public class OutstandingRequestsModel implements TableModel
@@ -32,16 +32,16 @@
{ "messageId", "type" };
final Class<?>[] columnClasses = new Class[]
{ Integer.class, String.class };
- final AbandonableRequest[] requests;
+ final InternalAbandonableRequest[] requests;
- OutstandingRequestsModel(AbandonableRequest[] requests)
+ OutstandingRequestsModel(InternalAbandonableRequest[] requests)
{
this.requests = requests;
}
- AbandonableRequest getAbandonableRequest( int row )
+ InternalAbandonableRequest getAbandonableRequest( int row )
{
return requests[row];
}
@@ -79,7 +79,7 @@
public Object getValueAt( int rowIndex, int columnIndex )
{
- AbandonableRequest req = requests[rowIndex];
+ InternalAbandonableRequest req = requests[rowIndex];
switch ( columnIndex )
{
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbandonHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbandonHandler.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbandonHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbandonHandler.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,7 @@
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.AbandonRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonRequest;
/**
@@ -30,13 +30,13 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class AbandonHandler extends LdapRequestHandler<AbandonRequest>
+public class AbandonHandler extends LdapRequestHandler<InternalAbandonRequest>
{
/**
* @see org.apache.directory.server.ldap.handlers.LdapRequestHandler#
* handle(org.apache.directory.server.ldap.LdapSession, org.apache.directory.shared.ldap.message.Request)
*/
- public void handle( LdapSession session, AbandonRequest request ) throws Exception
+ public void handle( LdapSession session, InternalAbandonRequest request ) throws Exception
{
int abandonedId = request.getAbandoned();
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java Sat Apr 11 01:03:00 2009
@@ -22,8 +22,8 @@
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.AddRequest;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalAddRequest;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.slf4j.Logger;
@@ -31,12 +31,12 @@
/**
- * An LDAP add operation {@link AddRequest} handler.
+ * An LDAP add operation {@link InternalAddRequest} handler.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class AddHandler extends LdapRequestHandler<AddRequest>
+public class AddHandler extends LdapRequestHandler<InternalAddRequest>
{
/** The logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( AddHandler.class );
@@ -45,10 +45,10 @@
/**
* {@inheritDoc}
*/
- public void handle( LdapSession session, AddRequest req )
+ public void handle( LdapSession session, InternalAddRequest req )
{
LOG.debug( "Handling request: {}", req );
- LdapResult result = req.getResultResponse().getLdapResult();
+ InternalLdapResult result = req.getResultResponse().getLdapResult();
try
{
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java Sat Apr 11 01:03:00 2009
@@ -48,9 +48,9 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.message.BindResponse;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindResponse;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.ExceptionUtils;
@@ -61,14 +61,14 @@
/**
- * A single reply handler for {@link BindRequest}s.
+ * A single reply handler for {@link InternalBindRequest}s.
*
* Implements server-side of RFC 2222, sections 4.2 and 4.3.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 664302 $, $Date: 2008-06-07 04:44:00 -0400 (Sat, 07 Jun 2008) $
*/
-public class BindHandler extends LdapRequestHandler<BindRequest>
+public class BindHandler extends LdapRequestHandler<InternalBindRequest>
{
private static final Logger LOG = LoggerFactory.getLogger( BindHandler.class );
@@ -93,7 +93,7 @@
* @param message The BindRequest received
* @throws Exception If the authentication cannot be done
*/
- public void handleSimpleAuth( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
+ public void handleSimpleAuth( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
{
// if the user is already bound, we have to unbind him
if ( !ldapSession.isAnonymous() )
@@ -153,7 +153,7 @@
if ( principalEntry == null )
{
LOG.info( "The {} principalDN cannot be found in the server : bind failure.", bindRequest.getName() );
- LdapResult result = bindRequest.getResultResponse().getLdapResult();
+ InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
result.setErrorMessage( "cannot bind the principalDn." );
result.setResultCode( ResultCodeEnum.INVALID_CREDENTIALS );
ldapSession.getIoSession().write( bindRequest.getResultResponse() );
@@ -164,7 +164,7 @@
SchemaConstants.REFERRAL_OC ) )
{
LOG.info( "Bind principalDn points to referral." );
- LdapResult result = bindRequest.getResultResponse().getLdapResult();
+ InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
result.setErrorMessage( "Bind principalDn points to referral." );
result.setResultCode( ResultCodeEnum.INVALID_CREDENTIALS );
ldapSession.getIoSession().write( bindRequest.getResultResponse() );
@@ -196,7 +196,7 @@
{
// Something went wrong. Write back an error message
ResultCodeEnum code = null;
- LdapResult result = bindRequest.getResultResponse().getLdapResult();
+ InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
if ( e instanceof LdapException )
{
@@ -265,9 +265,9 @@
* @param ss
* @param bindRequest
*/
- private void generateSaslChallenge( LdapSession ldapSession, SaslServer ss, BindRequest bindRequest )
+ private void generateSaslChallenge( LdapSession ldapSession, SaslServer ss, InternalBindRequest bindRequest )
{
- LdapResult result = bindRequest.getResultResponse().getLdapResult();
+ InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
// SaslServer will throw an exception if the credentials are null.
if ( bindRequest.getCredentials() == null )
@@ -303,7 +303,7 @@
// Build the response
result.setResultCode( ResultCodeEnum.SASL_BIND_IN_PROGRESS );
- BindResponse resp = ( BindResponse ) bindRequest.getResultResponse();
+ InternalBindResponse resp = ( InternalBindResponse ) bindRequest.getResultResponse();
// Store the challenge
resp.setServerSaslCreds( tokenBytes );
@@ -336,7 +336,7 @@
/**
* Send back an AUTH-METH-NOT-SUPPORTED error message to the client
*/
- private void sendAuthMethNotSupported( LdapSession ldapSession, BindRequest bindRequest )
+ private void sendAuthMethNotSupported( LdapSession ldapSession, InternalBindRequest bindRequest )
{
// First, r-einit the state to Anonymous, and clear the
// saslProperty map
@@ -344,7 +344,7 @@
ldapSession.setAnonymous();
// And send the response to the client
- LdapResult bindResult = bindRequest.getResultResponse().getLdapResult();
+ InternalLdapResult bindResult = bindRequest.getResultResponse().getLdapResult();
bindResult.setResultCode( ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED );
bindResult.setErrorMessage( ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED.toString() + ": "
+ bindRequest.getSaslMechanism() + " is not a supported mechanism." );
@@ -360,9 +360,9 @@
* Send back an INVALID-CREDENTIAL error message to the user. If we have an exception
* as a third argument, then send back the associated message to the client.
*/
- private void sendInvalidCredentials( LdapSession ldapSession, BindRequest bindRequest, Exception e )
+ private void sendInvalidCredentials( LdapSession ldapSession, InternalBindRequest bindRequest, Exception e )
{
- LdapResult result = bindRequest.getResultResponse().getLdapResult();
+ InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
String message = "";
@@ -391,10 +391,10 @@
/**
* Send a SUCCESS message back to the client.
*/
- private void sendBindSuccess( LdapSession ldapSession, BindRequest bindRequest, byte[] tokenBytes )
+ private void sendBindSuccess( LdapSession ldapSession, InternalBindRequest bindRequest, byte[] tokenBytes )
{
// Return the successful response
- BindResponse response = ( BindResponse ) bindRequest.getResultResponse();
+ InternalBindResponse response = ( InternalBindResponse ) bindRequest.getResultResponse();
response.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
response.setServerSaslCreds( tokenBytes );
@@ -423,7 +423,7 @@
}
- private void handleSaslAuthPending( LdapSession ldapSession, BindRequest bindRequest, DirectoryService ds ) throws Exception
+ private void handleSaslAuthPending( LdapSession ldapSession, InternalBindRequest bindRequest, DirectoryService ds ) throws Exception
{
// First, check that we have the same mechanism
String saslMechanism = bindRequest.getSaslMechanism();
@@ -533,7 +533,7 @@
* @param message The BindRequest received
* @throws Exception If the authentication cannot be done
*/
- public void handleSaslAuth( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
+ public void handleSaslAuth( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
{
String saslMechanism = bindRequest.getSaslMechanism();
DirectoryService ds = getLdapServer().getDirectoryService();
@@ -698,7 +698,7 @@
* @throws Exception If the authentication cannot be handled
*/
@Override
- public void handle( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
+ public void handle( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
{
LOG.debug( "Received: {}", bindRequest );
@@ -706,7 +706,7 @@
if ( ! bindRequest.getVersion3() )
{
LOG.error( "Bind error : Only LDAP v3 is supported." );
- LdapResult bindResult = bindRequest.getResultResponse().getLdapResult();
+ InternalLdapResult bindResult = bindRequest.getResultResponse().getLdapResult();
bindResult.setResultCode( ResultCodeEnum.PROTOCOL_ERROR );
bindResult.setErrorMessage( "Only LDAP v3 is supported." );
ldapSession.getIoSession().write( bindRequest.getResultResponse() );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java Sat Apr 11 01:03:00 2009
@@ -21,8 +21,8 @@
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalCompareRequest;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -31,12 +31,12 @@
/**
- * A single reply handler for {@link CompareRequest}s.
+ * A single reply handler for {@link InternalCompareRequest}s.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 664302 $
*/
-public class CompareHandler extends LdapRequestHandler<CompareRequest>
+public class CompareHandler extends LdapRequestHandler<InternalCompareRequest>
{
private static final Logger LOG = LoggerFactory.getLogger( CompareHandler.class );
@@ -47,10 +47,10 @@
* org.apache.directory.shared.ldap.message.SingleReplyRequest)
*/
@Override
- public void handle( LdapSession session, CompareRequest req )
+ public void handle( LdapSession session, InternalCompareRequest req )
{
LOG.debug( "Handling compare request while ignoring referrals: {}", req );
- LdapResult result = req.getResultResponse().getLdapResult();
+ InternalLdapResult result = req.getResultResponse().getLdapResult();
try
{
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java Sat Apr 11 01:03:00 2009
@@ -22,8 +22,8 @@
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.DeleteRequest;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.slf4j.Logger;
@@ -31,12 +31,12 @@
/**
- * A single reply handler for {@link DeleteRequest}s.
+ * A single reply handler for {@link InternalDeleteRequest}s.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 664302 $
*/
-public class DeleteHandler extends LdapRequestHandler<DeleteRequest>
+public class DeleteHandler extends LdapRequestHandler<InternalDeleteRequest>
{
private static final Logger LOG = LoggerFactory.getLogger( DeleteHandler.class );
@@ -44,10 +44,10 @@
/**
* {@inheritDoc}
*/
- public void handle( LdapSession session, DeleteRequest req )
+ public void handle( LdapSession session, InternalDeleteRequest req )
{
LOG.debug( "Handling request: {}", req );
- LdapResult result = req.getResultResponse().getLdapResult();
+ InternalLdapResult result = req.getResultResponse().getLdapResult();
try
{
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java Sat Apr 11 01:03:00 2009
@@ -22,22 +22,22 @@
import org.apache.directory.server.ldap.ExtendedOperationHandler;
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
+import org.apache.directory.shared.ldap.message.InternalExtendedResponse;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.util.ExceptionUtils;
/**
-* A single reply handler for {@link ExtendedRequest}s.
+* A single reply handler for {@link InternalExtendedRequest}s.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 664302 $
*/
-public class ExtendedHandler extends LdapRequestHandler<ExtendedRequest>
+public class ExtendedHandler extends LdapRequestHandler<InternalExtendedRequest>
{
- public void handle( LdapSession session, ExtendedRequest req ) throws Exception
+ public void handle( LdapSession session, InternalExtendedRequest req ) throws Exception
{
ExtendedOperationHandler handler = getLdapServer().getExtendedOperationHandler( req.getOid() );
@@ -46,7 +46,7 @@
// As long as no extended operations are implemented, send appropriate
// error back to the client.
String msg = "Unrecognized extended operation EXTENSION_OID: " + req.getOid();
- LdapResult result = req.getResultResponse().getLdapResult();
+ InternalLdapResult result = req.getResultResponse().getLdapResult();
result.setResultCode( ResultCodeEnum.PROTOCOL_ERROR );
result.setErrorMessage( msg );
session.getIoSession().write( req.getResultResponse() );
@@ -59,12 +59,12 @@
}
catch ( Exception e )
{
- LdapResult result = req.getResultResponse().getLdapResult();
+ InternalLdapResult result = req.getResultResponse().getLdapResult();
result.setResultCode( ResultCodeEnum.OTHER );
result.setErrorMessage( ResultCodeEnum.OTHER
+ ": Extended operation handler for the specified EXTENSION_OID (" + req.getOid()
+ ") has failed to process your request:\n" + ExceptionUtils.getStackTrace( e ) );
- ExtendedResponse resp = ( ExtendedResponse ) req.getResultResponse();
+ InternalExtendedResponse resp = ( InternalExtendedResponse ) req.getResultResponse();
resp.setResponse( new byte[0] );
session.getIoSession().write( req.getResultResponse() );
}
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java Sat Apr 11 01:03:00 2009
@@ -28,16 +28,16 @@
import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
-import org.apache.directory.shared.ldap.message.AbandonRequest;
-import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.message.LdapResult;
-import org.apache.directory.shared.ldap.message.Referral;
+import org.apache.directory.shared.ldap.message.InternalAbandonRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.InternalReferral;
import org.apache.directory.shared.ldap.message.ReferralImpl;
-import org.apache.directory.shared.ldap.message.Request;
+import org.apache.directory.shared.ldap.message.InternalRequest;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.ResultResponse;
-import org.apache.directory.shared.ldap.message.ResultResponseRequest;
+import org.apache.directory.shared.ldap.message.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.InternalResultResponseRequest;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.ExceptionUtils;
import org.apache.mina.core.filterchain.IoFilterChain;
@@ -53,7 +53,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 541827 $
*/
-public abstract class LdapRequestHandler<T extends Request> implements MessageHandler<T>
+public abstract class LdapRequestHandler<T extends InternalRequest> implements MessageHandler<T>
{
/** The logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( LdapRequestHandler.class );
@@ -108,9 +108,9 @@
}
- public void rejectWithoutConfidentiality( IoSession session, ResultResponse resp )
+ public void rejectWithoutConfidentiality( IoSession session, InternalResultResponse resp )
{
- LdapResult result = resp.getLdapResult();
+ InternalLdapResult result = resp.getLdapResult();
result.setResultCode( ResultCodeEnum.CONFIDENTIALITY_REQUIRED );
result.setErrorMessage( "Confidentiality (TLS secured connection) is required." );
session.write( resp );
@@ -131,10 +131,10 @@
// protect against insecure conns when confidentiality is required
if ( ! isConfidentialityRequirementSatisfied( session ) )
{
- if ( message instanceof ExtendedRequest )
+ if ( message instanceof InternalExtendedRequest )
{
// Reject all extended operations except StartTls
- ExtendedRequest req = ( ExtendedRequest ) message;
+ InternalExtendedRequest req = ( InternalExtendedRequest ) message;
if ( ! req.getID().equals( StartTlsHandler.EXTENSION_OID ) )
{
rejectWithoutConfidentiality( session, req.getResultResponse() );
@@ -143,10 +143,10 @@
// Allow StartTls extended operations to go through
}
- else if ( message instanceof ResultResponseRequest )
+ else if ( message instanceof InternalResultResponseRequest )
{
// Reject all other operations that have a result response
- rejectWithoutConfidentiality( session, ( ( ResultResponseRequest ) message ).getResultResponse() );
+ rejectWithoutConfidentiality( session, ( ( InternalResultResponseRequest ) message ).getResultResponse() );
return;
}
else // Just return from unbind, and abandon immediately
@@ -157,7 +157,7 @@
// We should check that the server allows anonymous requests
// only if it's not a BindRequest
- if ( message instanceof BindRequest )
+ if ( message instanceof InternalBindRequest )
{
handle( ldapSession, message );
}
@@ -180,7 +180,7 @@
coreSession = getLdapServer().getDirectoryService().getSession();
ldapSession.setCoreSession( coreSession );
- if ( message instanceof AbandonRequest )
+ if ( message instanceof InternalAbandonRequest )
{
return;
}
@@ -203,9 +203,9 @@
/**
* Handles processing with referrals without ManageDsaIT control.
*/
- public void handleException( LdapSession session, ResultResponseRequest req, Exception e )
+ public void handleException( LdapSession session, InternalResultResponseRequest req, Exception e )
{
- LdapResult result = req.getResultResponse().getLdapResult();
+ InternalLdapResult result = req.getResultResponse().getLdapResult();
/*
* Set the result code or guess the best option.
@@ -257,7 +257,7 @@
// Add the referrals if necessary
if ( e instanceof LdapReferralException )
{
- Referral referrals = new ReferralImpl();
+ InternalReferral referrals = new ReferralImpl();
do
{
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java Sat Apr 11 01:03:00 2009
@@ -22,8 +22,8 @@
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.LdapResult;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
@@ -32,12 +32,12 @@
/**
- * A single reply handler for {@link ModifyDnRequest}s.
+ * A single reply handler for {@link InternalModifyDnRequest}s.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 664302 $
*/
-public class ModifyDnHandler extends LdapRequestHandler<ModifyDnRequest>
+public class ModifyDnHandler extends LdapRequestHandler<InternalModifyDnRequest>
{
private static final Logger LOG = LoggerFactory.getLogger( ModifyDnHandler.class );
@@ -58,9 +58,9 @@
* - newSuperior : this is a move operation. The entry is removed from its
* current location, and created in the new one.
*/
- public void handle( LdapSession session, ModifyDnRequest req )
+ public void handle( LdapSession session, InternalModifyDnRequest req )
{
- LdapResult result = req.getResultResponse().getLdapResult();
+ InternalLdapResult result = req.getResultResponse().getLdapResult();
LOG.debug( "Handling modify dn request while ignoring referrals: {}", req );
if ( req.getName().isEmpty() )
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java Sat Apr 11 01:03:00 2009
@@ -22,8 +22,8 @@
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.LdapResult;
-import org.apache.directory.shared.ldap.message.ModifyRequest;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.InternalModifyRequest;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.slf4j.Logger;
@@ -31,12 +31,12 @@
/**
- * A single reply handler for {@link ModifyRequest}s.
+ * A single reply handler for {@link InternalModifyRequest}s.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 664302 $
*/
-public class ModifyHandler extends LdapRequestHandler<ModifyRequest>
+public class ModifyHandler extends LdapRequestHandler<InternalModifyRequest>
{
private static final Logger LOG = LoggerFactory.getLogger( ModifyHandler.class );
@@ -44,10 +44,10 @@
/**
* {@inheritDoc}
*/
- public void handle( LdapSession session, ModifyRequest req )
+ public void handle( LdapSession session, InternalModifyRequest req )
{
LOG.debug( "Handling request : {}", req );
- LdapResult result = req.getResultResponse().getLdapResult();
+ InternalLdapResult result = req.getResultResponse().getLdapResult();
try
{
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java Sat Apr 11 01:03:00 2009
@@ -33,9 +33,9 @@
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
import org.apache.directory.shared.ldap.message.AbandonListener;
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
-import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchResponseEntry;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchResponseEntry;
import org.apache.directory.shared.ldap.message.SearchResponseEntryImpl;
import org.apache.directory.shared.ldap.message.control.EntryChangeControl;
import org.apache.directory.shared.ldap.message.control.PersistentSearchControl;
@@ -61,11 +61,11 @@
{
private static final Logger LOG = LoggerFactory.getLogger( PersistentSearchListener.class );
final LdapSession session;
- final SearchRequest req;
+ final InternalSearchRequest req;
final PersistentSearchControl control;
- PersistentSearchListener( LdapSession session, SearchRequest req )
+ PersistentSearchListener( LdapSession session, InternalSearchRequest req )
{
this.session = session;
this.req = req;
@@ -94,7 +94,7 @@
}
- public void requestAbandoned( AbandonableRequest req )
+ public void requestAbandoned( InternalAbandonableRequest req )
{
try
{
@@ -107,7 +107,7 @@
}
- private void setECResponseControl( SearchResponseEntry response, ChangeOperationContext opContext, ChangeType type )
+ private void setECResponseControl( InternalSearchResponseEntry response, ChangeOperationContext opContext, ChangeType type )
{
if ( control.isReturnECs() )
{
@@ -136,7 +136,7 @@
return;
}
- SearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
+ InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
respEntry.setObjectName( opContext.getDn() );
respEntry.setEntry( opContext.getEntry() );
setECResponseControl( respEntry, opContext, ChangeType.ADD );
@@ -151,7 +151,7 @@
return;
}
- SearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
+ InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
respEntry.setObjectName( opContext.getDn() );
respEntry.setEntry( opContext.getEntry() );
setECResponseControl( respEntry, opContext, ChangeType.DELETE );
@@ -166,7 +166,7 @@
return;
}
- SearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
+ InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
respEntry.setObjectName( opContext.getDn() );
respEntry.setEntry( opContext.getEntry() );
setECResponseControl( respEntry, opContext, ChangeType.MODIFY );
@@ -181,7 +181,7 @@
return;
}
- SearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
+ InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
respEntry.setObjectName( opContext.getDn() );
respEntry.setEntry( opContext.getEntry() );
setECResponseControl( respEntry, opContext, ChangeType.MODDN );
@@ -202,7 +202,7 @@
return;
}
- SearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
+ InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
respEntry.setObjectName( opContext.getAlteredEntry().getDn() );
respEntry.setEntry( opContext.getAlteredEntry() );
setECResponseControl( respEntry, opContext, ChangeType.MODDN );
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java Sat Apr 11 01:03:00 2009
@@ -31,12 +31,12 @@
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.LdapResult;
-import org.apache.directory.shared.ldap.message.Referral;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.InternalReferral;
import org.apache.directory.shared.ldap.message.ReferralImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.ResultResponseRequest;
-import org.apache.directory.shared.ldap.message.SearchRequest;
+import org.apache.directory.shared.ldap.message.InternalResultResponseRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.ExceptionUtils;
@@ -56,7 +56,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public abstract class ReferralAwareRequestHandler<T extends ResultResponseRequest> extends LdapRequestHandler<T>
+public abstract class ReferralAwareRequestHandler<T extends InternalResultResponseRequest> extends LdapRequestHandler<T>
{
private static final Logger LOG = LoggerFactory.getLogger( ReferralAwareRequestHandler.class );
@@ -93,7 +93,7 @@
switch ( req.getType() )
{
case SEARCH_REQUEST:
- handleWithReferrals( session, ( ( SearchRequest ) req ).getBase(), req );
+ handleWithReferrals( session, ( ( InternalSearchRequest ) req ).getBase(), req );
break;
case EXTENDED_REQ:
@@ -188,14 +188,14 @@
* @param referralAncestor the farthest referral ancestor of the missing
* entry
*/
- public Referral getReferralOnAncestor( LdapSession session, LdapDN reqTargetDn, T req,
+ public InternalReferral getReferralOnAncestor( LdapSession session, LdapDN reqTargetDn, T req,
ClonedServerEntry referralAncestor ) throws Exception
{
LOG.debug( "Inside getReferralOnAncestor()" );
ServerAttribute refAttr = ( ServerAttribute ) referralAncestor.getOriginalEntry()
.get( SchemaConstants.REF_AT );
- Referral referral = new ReferralImpl();
+ InternalReferral referral = new ReferralImpl();
for ( Value<?> value : refAttr )
{
@@ -287,14 +287,14 @@
* @param referralAncestor the farthest referral ancestor of the missing
* entry
*/
- public Referral getReferralOnAncestorForSearch( LdapSession session, SearchRequest req,
+ public InternalReferral getReferralOnAncestorForSearch( LdapSession session, InternalSearchRequest req,
ClonedServerEntry referralAncestor ) throws Exception
{
LOG.debug( "Inside getReferralOnAncestor()" );
ServerAttribute refAttr = ( ServerAttribute ) referralAncestor.getOriginalEntry()
.get( SchemaConstants.REF_AT );
- Referral referral = new ReferralImpl();
+ InternalReferral referral = new ReferralImpl();
for ( Value<?> value : refAttr )
{
@@ -364,9 +364,9 @@
/**
* Handles processing with referrals without ManageDsaIT control.
*/
- public void handleException( LdapSession session, ResultResponseRequest req, Exception e )
+ public void handleException( LdapSession session, InternalResultResponseRequest req, Exception e )
{
- LdapResult result = req.getResultResponse().getLdapResult();
+ InternalLdapResult result = req.getResultResponse().getLdapResult();
/*
* Set the result code or guess the best option.
Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java (original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java Sat Apr 11 01:03:00 2009
@@ -25,7 +25,7 @@
import org.apache.directory.server.ldap.LdapService;
import org.apache.directory.shared.ldap.exception.OperationAbandonedException;
import org.apache.directory.shared.ldap.message.AbandonListener;
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +70,7 @@
}
- public void requestAbandoned( AbandonableRequest req )
+ public void requestAbandoned( InternalAbandonableRequest req )
{
if ( listener != null )
{