directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1072822 [2/2] - in /directory: project/trunk/resources/ shared/branches/akarasulu/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ shared/branches/akarasulu/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/...
Date Mon, 21 Feb 2011 02:02:27 GMT
Modified: directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java (original)
+++ directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java Mon Feb 21 02:02:24 2011
@@ -39,6 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.Modification;
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.message.ModifyRequest;
+import org.apache.directory.shared.ldap.model.message.ModifyResponse;
 import org.apache.directory.shared.ldap.model.name.Dn;
 
 
@@ -47,7 +48,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ModifyRequestDecorator extends SingleReplyRequestDecorator<ModifyRequest>
+public class ModifyRequestDecorator extends SingleReplyRequestDecorator<ModifyRequest,ModifyResponse>
     implements ModifyRequest
 {
     /** The modify request length */

Modified: directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java (original)
+++ directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java Mon Feb 21 02:02:24 2011
@@ -30,8 +30,8 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class ResultResponseRequestDecorator<M extends ResultResponseRequest> 
-    extends RequestDecorator<M> implements ResultResponseRequest
+public abstract class ResultResponseRequestDecorator<M extends ResultResponseRequest<R>, R extends ResultResponse> 
+    extends RequestDecorator<M> implements ResultResponseRequest<R>
 {
     /**
      * Makes Request a MessageDecorator.
@@ -56,7 +56,7 @@ public abstract class ResultResponseRequ
     /**
      * {@inheritDoc}
      */
-    public ResultResponse getResultResponse()
+    public R getResultResponse()
     {
         return getDecorated().getResultResponse();
     }

Modified: directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java (original)
+++ directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java Mon Feb 21 02:02:24 2011
@@ -67,8 +67,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
 import org.apache.directory.shared.ldap.model.message.Message;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.model.message.ResultResponse;
 import org.apache.directory.shared.ldap.model.message.SearchRequest;
+import org.apache.directory.shared.ldap.model.message.SearchResultDone;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.util.Strings;
 
@@ -978,7 +978,7 @@ public class SearchRequestDecorator exte
     }
 
 
-    public ResultResponse getResultResponse()
+    public SearchResultDone getResultResponse()
     {
         return getDecorated().getResultResponse();
     }

Modified: directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java (original)
+++ directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java Mon Feb 21 02:02:24 2011
@@ -24,6 +24,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.message.AbandonListener;
 import org.apache.directory.shared.ldap.model.message.AbandonableRequest;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
+import org.apache.directory.shared.ldap.model.message.ResultResponse;
 import org.apache.directory.shared.ldap.model.message.SingleReplyRequest;
 
 
@@ -32,8 +33,8 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class SingleReplyRequestDecorator<M extends SingleReplyRequest> 
-    extends ResultResponseRequestDecorator<M> implements SingleReplyRequest, AbandonableRequest
+public abstract class SingleReplyRequestDecorator<M extends SingleReplyRequest<R>, R extends ResultResponse> 
+    extends ResultResponseRequestDecorator<M,R> implements SingleReplyRequest<R>, AbandonableRequest
 {
     /**
      * Makes Request a MessageDecorator.

Modified: directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java (original)
+++ directory/shared/branches/akarasulu/ldap-codec/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java Mon Feb 21 02:02:24 2011
@@ -39,8 +39,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory;
 import org.apache.directory.shared.ldap.codec.protocol.mina.LdapProtocolCodecFactory;
 import org.apache.directory.shared.ldap.model.message.Control;
+import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
 import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.model.message.ExtendedResponseImpl;
 import org.apache.directory.shared.ldap.model.message.Message;
 import org.apache.directory.shared.ldap.model.message.controls.OpaqueControl;
 import org.apache.directory.shared.util.exception.NotImplementedException;
@@ -334,23 +334,24 @@ public class DefaultLdapCodecService imp
      */
     public javax.naming.ldap.ExtendedResponse toJndi( final ExtendedResponse modelResponse ) throws EncoderException
     {
-        final byte[] encodedValue = new byte[ modelResponse.getEncodedValue().length ];
-        System.arraycopy( modelResponse.getEncodedValue(), 0, encodedValue, 0, modelResponse.getEncodedValue().length );
-        
-        return new javax.naming.ldap.ExtendedResponse()
-        {
-            private static final long serialVersionUID = 2955142105375495493L;
-
-            public String getID()
-            {
-                return modelResponse.getID();
-            }
-
-            public byte[] getEncodedValue()
-            {
-                return encodedValue;
-            }
-        };
+        throw new NotImplementedException( "Figure out how to transform" );
+//        final byte[] encodedValue = new byte[ modelResponse.getEncodedValue().length ];
+//        System.arraycopy( modelResponse.getEncodedValue(), 0, encodedValue, 0, modelResponse.getEncodedValue().length );
+//        
+//        return new javax.naming.ldap.ExtendedResponse()
+//        {
+//            private static final long serialVersionUID = 2955142105375495493L;
+//
+//            public String getID()
+//            {
+//                return modelResponse.getID();
+//            }
+//
+//            public byte[] getEncodedValue()
+//            {
+//                return encodedValue;
+//            }
+//        };
     }
     
 
@@ -359,24 +360,45 @@ public class DefaultLdapCodecService imp
      */
     public ExtendedResponse fromJndi( javax.naming.ldap.ExtendedResponse jndiResponse ) throws DecoderException
     {   
-        ExtendedResponse modelResponse;
-        ExtendedRequestFactory<?,?> extendedRequestFactory = extReqFactories.get( jndiResponse.getID() );
-        UnsolicitedResponseFactory<?> unsolicitedResponseFactory = unsolicitedFactories.get( jndiResponse.getID() );
-        
-        if ( unsolicitedResponseFactory != null )
-        {
-            modelResponse = unsolicitedResponseFactory.newResponse( jndiResponse.getEncodedValue() );
-        }
-        else if ( extendedRequestFactory != null )
-        {
-            modelResponse = extendedRequestFactory.newResponse( jndiResponse.getEncodedValue() );
-        }
-        else
-        {
-            modelResponse = new ExtendedResponseImpl( jndiResponse.getID() );
-            modelResponse.setResponseValue( jndiResponse.getEncodedValue() );
-        }
-        
-        return modelResponse;
+        throw new NotImplementedException( "Figure out how to transform" );
+//        ExtendedResponse modelResponse;
+//        ExtendedRequestFactory<?,?> extendedRequestFactory = extReqFactories.get( jndiResponse.getID() );
+//        UnsolicitedResponseFactory<?> unsolicitedResponseFactory = unsolicitedFactories.get( jndiResponse.getID() );
+//        
+//        if ( unsolicitedResponseFactory != null )
+//        {
+//            modelResponse = unsolicitedResponseFactory.newResponse( jndiResponse.getEncodedValue() );
+//        }
+//        else if ( extendedRequestFactory != null )
+//        {
+//            modelResponse = extendedRequestFactory.newResponse( jndiResponse.getEncodedValue() );
+//        }
+//        else
+//        {
+//            modelResponse = new ExtendedResponseImpl( jndiResponse.getID() );
+//            modelResponse.setResponseValue( jndiResponse.getEncodedValue() );
+//        }
+//        
+//        return modelResponse;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public ExtendedRequest<?> fromJndi( javax.naming.ldap.ExtendedRequest jndiRequest ) throws DecoderException
+    {
+        // TODO Auto-generated method stub
+        throw new NotImplementedException();
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public javax.naming.ldap.ExtendedRequest toJndi( ExtendedRequest<?> modelRequest ) throws EncoderException
+    {
+        // TODO Auto-generated method stub
+        throw new NotImplementedException();
     }
 }

Modified: directory/shared/branches/akarasulu/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java (original)
+++ directory/shared/branches/akarasulu/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java Mon Feb 21 02:02:24 2011
@@ -37,7 +37,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.api.ExtendedRequestDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
 import org.apache.directory.shared.ldap.model.message.Control;
-import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -91,8 +90,7 @@ public class ExtendedRequestTest extends
         }
 
         // Check the decoded ExtendedRequest PDU
-        ExtendedRequest extendedRequest = container
-            .getMessage();
+        ExtendedRequestDecorator extendedRequest = container.getMessage();
 
         assertEquals( 1, extendedRequest.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
@@ -163,7 +161,7 @@ public class ExtendedRequestTest extends
         }
 
         // Check the decoded ExtendedRequest PDU
-        ExtendedRequest extendedRequest = container.getMessage();
+        ExtendedRequestDecorator extendedRequest = container.getMessage();
 
         assertEquals( 1, extendedRequest.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
@@ -245,7 +243,7 @@ public class ExtendedRequestTest extends
         }
 
         // Check the decoded ExtendedRequest PDU
-        ExtendedRequest extendedRequest = container.getMessage();
+        ExtendedRequestDecorator extendedRequest = container.getMessage();
 
         assertEquals( 1, extendedRequest.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
@@ -428,7 +426,7 @@ public class ExtendedRequestTest extends
         }
 
         // Check the decoded ExtendedRequest PDU
-        ExtendedRequest extendedRequest = container.getMessage();
+        ExtendedRequestDecorator extendedRequest = container.getMessage();
 
         assertEquals( 1, extendedRequest.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );
@@ -494,7 +492,7 @@ public class ExtendedRequestTest extends
         }
 
         // Check the decoded ExtendedRequest PDU
-        ExtendedRequest extendedRequest = container.getMessage();
+        ExtendedRequestDecorator extendedRequest = container.getMessage();
 
         assertEquals( 1, extendedRequest.getMessageId() );
         assertEquals( "1.3.6.1.5.5.2", extendedRequest.getRequestName() );

Modified: directory/shared/branches/akarasulu/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java (original)
+++ directory/shared/branches/akarasulu/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java Mon Feb 21 02:02:24 2011
@@ -100,14 +100,14 @@ public class ExtendedResponseTest extend
         }
 
         // Check the decoded ExtendedResponse PDU
-        ExtendedResponse extendedResponse = container.getMessage();
+        ExtendedResponseDecorator extendedResponse = container.getMessage();
 
         assertEquals( 1, extendedResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
         assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
-        assertEquals( "1.3.6.1.5.5.2", extendedResponse.getID() );
-        assertEquals( "value", Strings.utf8ToString((byte[]) extendedResponse.getEncodedValue()) );
+        assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() );
+        assertEquals( "value", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue()) );
 
         // Check the encoding
         try
@@ -192,14 +192,14 @@ public class ExtendedResponseTest extend
         }
 
         // Check the decoded ExtendedResponse PDU
-        ExtendedResponse extendedResponse = container.getMessage();
+        ExtendedResponseDecorator extendedResponse = container.getMessage();
 
         assertEquals( 1, extendedResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
         assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
-        assertEquals( "1.3.6.1.5.5.2", extendedResponse.getID() );
-        assertEquals( "value", Strings.utf8ToString((byte[]) extendedResponse.getEncodedValue()) );
+        assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() );
+        assertEquals( "value", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue()) );
 
         // Check the Control
         Map<String, Control> controls = extendedResponse.getControls();
@@ -566,14 +566,14 @@ public class ExtendedResponseTest extend
         }
 
         // Check the decoded ExtendedResponse PDU
-        ExtendedResponse extendedResponse = container.getMessage();
+        ExtendedResponseDecorator extendedResponse = container.getMessage();
 
         assertEquals( 1, extendedResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
         assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
-        assertEquals( "1.3.6.1.5.5.2", extendedResponse.getID() );
-        assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getEncodedValue()) );
+        assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() );
+        assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue()) );
 
         // Check the encoding
         try
@@ -653,14 +653,14 @@ public class ExtendedResponseTest extend
         }
 
         // Check the decoded ExtendedResponse PDU
-        ExtendedResponse extendedResponse = container.getMessage();
+        ExtendedResponseDecorator extendedResponse = container.getMessage();
 
         assertEquals( 1, extendedResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
         assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
-        assertEquals( "1.3.6.1.5.5.2", extendedResponse.getID() );
-        assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getEncodedValue()) );
+        assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() );
+        assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue()) );
 
         // Check the Control
         Map<String, Control> controls = extendedResponse.getControls();
@@ -746,14 +746,14 @@ public class ExtendedResponseTest extend
         }
 
         // Check the decoded ExtendedResponse PDU
-        ExtendedResponse extendedResponse = container.getMessage();
+        ExtendedResponseDecorator extendedResponse = container.getMessage();
 
         assertEquals( 1, extendedResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
         assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
-        assertEquals( "1.3.6.1.5.5.2", extendedResponse.getID() );
-        assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getEncodedValue()) );
+        assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() );
+        assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue()) );
 
         // Check the encoding
         try
@@ -834,14 +834,14 @@ public class ExtendedResponseTest extend
         }
 
         // Check the decoded ExtendedResponse PDU
-        ExtendedResponse extendedResponse = container.getMessage();
+        ExtendedResponseDecorator extendedResponse = container.getMessage();
 
         assertEquals( 1, extendedResponse.getMessageId() );
         assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
         assertEquals( "", extendedResponse.getLdapResult().getMatchedDn().getName() );
         assertEquals( "", extendedResponse.getLdapResult().getErrorMessage() );
-        assertEquals( "1.3.6.1.5.5.2", extendedResponse.getID() );
-        assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getEncodedValue()) );
+        assertEquals( "1.3.6.1.5.5.2", extendedResponse.getResponseName() );
+        assertEquals( "", Strings.utf8ToString((byte[]) extendedResponse.getResponseValue()) );
 
         // Check the Control
         Map<String, Control> controls = extendedResponse.getControls();

Modified: directory/shared/branches/akarasulu/ldap-extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java (original)
+++ directory/shared/branches/akarasulu/ldap-extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java Mon Feb 21 02:02:24 2011
@@ -30,13 +30,14 @@ import java.net.URL;
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
+import javax.naming.ldap.ExtendedRequest;
 import javax.naming.ldap.ExtendedResponse;
 import javax.naming.ldap.LdapContext;
 
 import org.apache.commons.lang.SerializationUtils;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
 import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequest;
-import org.apache.directory.shared.ldap.util.JndiUtils;
 
 
 /**
@@ -149,7 +150,8 @@ public final class JavaStoredProcUtils
              * Call the stored procedure via the extended operation
              * and get back its return value.
              */
-            ExtendedResponse resp = ctx.extendedOperation( JndiUtils.toJndiExtendedRequest( req ) );
+            ExtendedRequest jndiReq = LdapCodecServiceFactory.getSingleton().toJndi( req );
+            ExtendedResponse resp = ctx.extendedOperation( jndiReq );
 
             /**
              * Restore a Java object from the return value.

Modified: directory/shared/branches/akarasulu/ldap-extras/util/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-extras/util/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-extras/util/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java (original)
+++ directory/shared/branches/akarasulu/ldap-extras/util/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java Mon Feb 21 02:02:24 2011
@@ -45,7 +45,6 @@ import javax.naming.directory.InvalidAtt
 import javax.naming.directory.InvalidSearchFilterException;
 import javax.naming.directory.NoSuchAttributeException;
 import javax.naming.directory.SchemaViolationException;
-import javax.naming.ldap.ExtendedRequest;
 import javax.naming.ldap.ExtendedResponse;
 import javax.naming.ldap.LdapName;
 
@@ -79,10 +78,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.exception.MessageException;
 import org.apache.directory.shared.ldap.model.message.Control;
-import org.apache.directory.shared.ldap.model.message.ExtendedResponseImpl;
 import org.apache.directory.shared.ldap.model.message.LdapResult;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.model.message.ResultResponse;
 import org.apache.directory.shared.ldap.model.name.Dn;
 
 
@@ -169,76 +166,6 @@ public final class JndiUtils
      * @param request
      * @return
      */
-    public static ExtendedResponse toJndiExtendedResponse(
-        final org.apache.directory.shared.ldap.model.message.ExtendedResponse response )
-    {
-        class JndiExtendedResponse implements ExtendedResponse
-        {
-            private static final long serialVersionUID = 1L;
-
-            
-            public byte[] getEncodedValue()
-            {
-                return response.getEncodedValue();
-            }
-
-
-            public String getID()
-            {
-                return response.getResponseName();
-            }
-        }
-
-        return new JndiExtendedResponse();
-    }
-
-
-    public static ExtendedRequest toJndiExtendedRequest(
-        final org.apache.directory.shared.ldap.model.message.ExtendedRequest request )
-    {
-        class JndiExtendedRequest implements ExtendedRequest
-        {
-            private static final long serialVersionUID = 1L;
-            private ExtendedResponse response;
-
-
-            public ExtendedResponse createExtendedResponse( String id, byte[] berValue, int offset, int length )
-                throws NamingException
-            {
-                org.apache.directory.shared.ldap.model.message.ExtendedResponse response = new ExtendedResponseImpl( request
-                    .getMessageId(), request.getRequestName() );
-                response.setResponseName( id );
-                response.setResponseValue( berValue );
-
-                this.response = JndiUtils.toJndiExtendedResponse( response );
-
-                return this.response;
-            }
-
-
-            public byte[] getEncodedValue()
-            {
-                return request.getRequestValue();
-            }
-
-
-            public String getID()
-            {
-                return request.getRequestName();
-            }
-
-        }
-
-        return new JndiExtendedRequest();
-    }
-
-
-    /**
-     * TODO toJndiExtendedResponse. This is NOT correct ATM
-     *
-     * @param request
-     * @return
-     */
     public static org.apache.directory.shared.ldap.model.message.ExtendedResponse fromJndiExtendedResponse(
         final ExtendedResponse response )
     {
@@ -252,22 +179,11 @@ public final class JndiUtils
             }
 
 
-            public byte[] getResponseValue()
-            {
-                return response.getEncodedValue();
-            }
-
-
             public void setResponseName( String oid )
             {
             }
 
 
-            public void setResponseValue( byte[] responseValue )
-            {
-            }
-
-
             public LdapResult getLdapResult()
             {
                 return null;
@@ -367,171 +283,12 @@ public final class JndiUtils
             public void setMessageLength( int messageLength )
             {
             }
-
-
-            public byte[] getEncodedValue()
-            {
-                // TODO Auto-generated method stub
-                return null;
-            }
-
-
-            public String getID()
-            {
-                // TODO Auto-generated method stub
-                return null;
-            }
         }
 
         return new ServerExtendedResponse();
     }
 
 
-    public static org.apache.directory.shared.ldap.model.message.ExtendedRequest fromJndiExtendedRequest(
-        final ExtendedRequest request )
-    {
-        class ServerExtendedRequest implements org.apache.directory.shared.ldap.model.message.ExtendedRequest
-        {
-            public String getRequestName()
-            {
-                return request.getID();
-            }
-
-
-            public byte[] getRequestValue()
-            {
-                return request.getEncodedValue();
-            }
-
-
-            public void setRequestName( String oid )
-            {
-            }
-
-
-            public void setRequestValue( byte[] requestValue )
-            {
-            }
-
-
-            public MessageTypeEnum getResponseType()
-            {
-                return null;
-            }
-
-
-            public ResultResponse getResultResponse()
-            {
-                return null;
-            }
-
-
-            public boolean hasResponse()
-            {
-                return false;
-            }
-
-
-            public void addAllControls( Control[] controls ) throws MessageException
-            {
-            }
-
-
-            public void addControl( Control control ) throws MessageException
-            {
-            }
-
-
-            public Object get( Object key )
-            {
-                return null;
-            }
-
-
-            public Control getControl( String oid )
-            {
-                return null;
-            }
-
-
-            public Map<String, Control> getControls()
-            {
-                return null;
-            }
-
-
-            @SuppressWarnings("unused")
-            public int getControlsLength()
-            {
-                return 0;
-            }
-
-
-            @SuppressWarnings("unused")
-            public Control getCurrentControl()
-            {
-                return null;
-            }
-
-
-            public int getMessageId()
-            {
-                return 0;
-            }
-
-
-            @SuppressWarnings("unused")
-            public int getMessageLength()
-            {
-                return 0;
-            }
-
-
-            public MessageTypeEnum getType()
-            {
-                return null;
-            }
-
-
-            public boolean hasControl( String oid )
-            {
-                return false;
-            }
-
-
-            public Object put( Object key, Object value )
-            {
-                return null;
-            }
-
-
-            public void removeControl( Control control ) throws MessageException
-            {
-            }
-
-
-            @SuppressWarnings("unused")
-            public void setControlsLength( int controlsLength )
-            {
-            }
-
-
-            public void setMessageId( int messageId )
-            {
-            }
-
-
-            @SuppressWarnings("unused")
-            public void setMessageLength( int messageLength )
-            {
-            }
-
-        }
-
-        return new ServerExtendedRequest();
-    }
-
-
     public static void wrap( Throwable t ) throws NamingException
     {
         if ( t instanceof NamingException )

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequest.java Mon Feb 21 02:02:24 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface AddRequest extends SingleReplyRequest, AbandonableRequest
+public interface AddRequest extends SingleReplyRequest<AddResponse>, AbandonableRequest
 {
     /** LDAPv3 add request type enum code */
     MessageTypeEnum TYPE = MessageTypeEnum.ADD_REQUEST;

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/AddRequestImpl.java Mon Feb 21 02:02:24 2011
@@ -206,7 +206,7 @@ public class AddRequestImpl extends Abst
      * 
      * @return the result containing response for this request
      */
-    public ResultResponse getResultResponse()
+    public AddResponse getResultResponse()
     {
         if ( response == null )
         {

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindRequest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindRequest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindRequest.java Mon Feb 21 02:02:24 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface BindRequest extends SingleReplyRequest, AbandonableRequest
+public interface BindRequest extends SingleReplyRequest<BindResponse>, AbandonableRequest
 {
     /** Bind request message type enumeration value */
     MessageTypeEnum TYPE = MessageTypeEnum.BIND_REQUEST;

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindRequestImpl.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindRequestImpl.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/BindRequestImpl.java Mon Feb 21 02:02:24 2011
@@ -310,7 +310,7 @@ public class BindRequestImpl extends Abs
      * 
      * @return the result containing response for this request
      */
-    public ResultResponse getResultResponse()
+    public BindResponse getResultResponse()
     {
         if ( response == null )
         {

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequest.java Mon Feb 21 02:02:24 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface CompareRequest extends SingleReplyRequest, AbandonableRequest
+public interface CompareRequest extends SingleReplyRequest<CompareResponse>, AbandonableRequest
 {
     /** Compare request message type enum code */
     MessageTypeEnum TYPE = MessageTypeEnum.COMPARE_REQUEST;

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/CompareRequestImpl.java Mon Feb 21 02:02:24 2011
@@ -186,7 +186,7 @@ public class CompareRequestImpl extends 
      * 
      * @return the result containing response for this request
      */
-    public ResultResponse getResultResponse()
+    public CompareResponse getResultResponse()
     {
         if ( response == null )
         {

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteRequest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteRequest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteRequest.java Mon Feb 21 02:02:24 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface DeleteRequest extends SingleReplyRequest, AbandonableRequest
+public interface DeleteRequest extends SingleReplyRequest<DeleteResponse>, AbandonableRequest
 {
     /** Delete request message type enumeration value */
     MessageTypeEnum TYPE = MessageTypeEnum.DEL_REQUEST;

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImpl.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImpl.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImpl.java Mon Feb 21 02:02:24 2011
@@ -114,7 +114,7 @@ public class DeleteRequestImpl extends A
      * 
      * @return the result containing response for this request
      */
-    public ResultResponse getResultResponse()
+    public DeleteResponse getResultResponse()
     {
         if ( response == null )
         {

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequest.java Mon Feb 21 02:02:24 2011
@@ -52,7 +52,7 @@ package org.apache.directory.shared.ldap
  *  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * 
  */
-public interface ExtendedRequest extends SingleReplyRequest
+public interface ExtendedRequest<R extends ExtendedResponse> extends SingleReplyRequest<R>
 {
     /** Extended request message type enumeration value */
     MessageTypeEnum TYPE = MessageTypeEnum.EXTENDED_REQUEST;
@@ -62,8 +62,8 @@ public interface ExtendedRequest extends
 
 
     /**
-     * Gets the Object Idendifier corresponding to the extended request type.
-     * This is the <b>requestName</b> portion of the ext. req. PDU.
+     * Gets the Object Identifier corresponding to the extended request type.
+     * This is the <b>requestName</b> portion of the ExtendedRequst PDU.
      * 
      * @return the dotted-decimal representation as a String of the OID
      */
@@ -71,27 +71,9 @@ public interface ExtendedRequest extends
 
 
     /**
-     * Sets the Object Idendifier corresponding to the extended request type.
+     * Sets the Object Identifier corresponding to the extended request type.
      * 
      * @param oid the dotted-decimal representation as a String of the OID
      */
     void setRequestName( String oid );
-
-
-    /**
-     * Gets the extended request's <b>requestValue</b> portion of the PDU. The
-     * form of the data is request specific and is determined by the extended
-     * request OID.
-     * 
-     * @return byte array of data
-     */
-    byte[] getRequestValue();
-
-
-    /**
-     * Sets the extended request's <b>requestValue</b> portion of the PDU.
-     * 
-     * @param requestValue byte array of data encapsulating ext. req. parameters
-     */
-    void setRequestValue( byte[] requestValue );
 }

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImpl.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImpl.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImpl.java Mon Feb 21 02:02:24 2011
@@ -20,31 +20,20 @@
 package org.apache.directory.shared.ldap.model.message;
 
 
-import java.util.Arrays;
-
-import javax.naming.NamingException;
-import javax.naming.ldap.ExtendedResponse;
-
-import org.apache.directory.shared.util.Strings;
-
-
 /**
  * ExtendedRequest implementation.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ExtendedRequestImpl extends AbstractRequest implements ExtendedRequest
+public class ExtendedRequestImpl extends AbstractRequest implements ExtendedRequest<ExtendedResponse>
 {
     static final long serialVersionUID = 7916990159044177480L;
 
     /** Extended request's Object Identifier or <b>requestName</b> */
     private String oid;
 
-    /** Extended request's value */
-    protected byte[] requestValue;
-
     /** The associated response */
-    protected ResultResponse response;
+    protected ExtendedResponse response;
 
 
     /**
@@ -73,53 +62,27 @@ public class ExtendedRequestImpl extends
     // ExtendedRequest Interface Method Implementations
     // -----------------------------------------------------------------------
 
-    /**
-     * Sets the Object Identifier corresponding to the extended request type.
-     * 
-     * @param newOid the dotted-decimal representation as a String of the OID
-     */
-    public void setRequestName( String newOid )
-    {
-        this.oid = newOid;
-    }
-
 
     /**
-     * Gets the extended request's <b>requestValue</b> portion of the PDU. The
-     * form of the data is request specific and is determined by the extended
-     * request OID.
+     * Gets the Object Identifier corresponding to the extended request type.
+     * This is the <b>requestName</b> portion of the ext. req. PDU.
      * 
-     * @return byte array of data
+     * @return the dotted-decimal representation as a String of the OID
      */
-    public byte[] getRequestValue()
+    public String getRequestName()
     {
-        if ( requestValue == null )
-        {
-            return null;
-        }
-
-        final byte[] copy = new byte[requestValue.length];
-        System.arraycopy( requestValue, 0, copy, 0, requestValue.length );
-        return copy;
+        return oid;
     }
 
-
+    
     /**
-     * Sets the extended request's <b>requestValue</b> portion of the PDU.
+     * Sets the Object Identifier corresponding to the extended request type.
      * 
-     * @param payload byte array of data encapsulating ext. req. parameters
+     * @param newOid the dotted-decimal representation as a String of the OID
      */
-    public void setRequestValue( byte[] payload )
+    public void setRequestName( String newOid )
     {
-        if ( payload != null )
-        {
-            this.requestValue = new byte[payload.length];
-            System.arraycopy( payload, 0, this.requestValue, 0, payload.length );
-        }
-        else
-        {
-            this.requestValue = null;
-        }
+        this.oid = newOid;
     }
 
 
@@ -144,7 +107,7 @@ public class ExtendedRequestImpl extends
      * 
      * @return the result containing response for this request
      */
-    public ResultResponse getResultResponse()
+    public ExtendedResponse getResultResponse()
     {
         if ( response == null )
         {
@@ -166,10 +129,6 @@ public class ExtendedRequestImpl extends
         {
             hash = hash * 17 + oid.hashCode();
         }
-        if ( requestValue != null )
-        {
-            hash = hash * 17 + Arrays.hashCode( requestValue );
-        }
         hash = hash * 17 + super.hashCode();
 
         return hash;
@@ -199,7 +158,7 @@ public class ExtendedRequestImpl extends
             return false;
         }
 
-        ExtendedRequest req = ( ExtendedRequest ) obj;
+        ExtendedRequest<?> req = ( ExtendedRequest<?> ) obj;
 
         if ( ( oid != null ) && ( req.getRequestName() == null ) )
         {
@@ -215,50 +174,8 @@ public class ExtendedRequestImpl extends
         {
             return false;
         }
-
-        if ( ( requestValue != null ) && ( req.getRequestValue() == null ) )
-        {
-            return false;
-        }
-
-        if ( ( requestValue == null ) && ( req.getRequestValue() != null ) )
-        {
-            return false;
-        }
-
-        return ( ( requestValue == null ) || ( req.getRequestValue() == null )
-            || Arrays.equals( requestValue, req.getRequestValue() ) );
-    }
-
-
-    /**
-     * Gets the Object Idendifier corresponding to the extended request type.
-     * This is the <b>requestName</b> portion of the ext. req. PDU.
-     * 
-     * @return the dotted-decimal representation as a String of the OID
-     */
-    public String getRequestName()
-    {
-        return oid;
-    }
-
-
-    /**
-     * Creates the extended response.
-     * 
-     * This implement always returns null.
-     *
-     * @param id the OID
-     * @param berValue the value
-     * @param offset the offset
-     * @param length the length
-     * @return the extended response
-     * @throws NamingException the naming exception
-     */
-    public ExtendedResponse createExtendedResponse( String id, byte[] berValue, int offset, int length )
-        throws NamingException
-    {
-        return null;
+        
+        return true;
     }
 
 
@@ -274,12 +191,6 @@ public class ExtendedRequestImpl extends
         sb.append( "    Extended request\n" );
         sb.append( "        Request name : '" ).append( oid ).append( "'\n" );
 
-        if ( oid != null )
-        {
-            sb.append( "        Request value : '" ).append( Strings.utf8ToString(requestValue) ).append( '/' )
-                .append( Strings.dumpBytes(requestValue) ).append( "'\n" );
-        }
-
         // The controls
         sb.append( super.toString() );
 

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedResponse.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedResponse.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedResponse.java Mon Feb 21 02:02:24 2011
@@ -26,7 +26,7 @@ package org.apache.directory.shared.ldap
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface ExtendedResponse extends ResultResponse, javax.naming.ldap.ExtendedResponse
+public interface ExtendedResponse extends ResultResponse
 {
     /** Extended response message type enumeration value */
     MessageTypeEnum TYPE = MessageTypeEnum.EXTENDED_RESPONSE;
@@ -48,20 +48,4 @@ public interface ExtendedResponse extend
      * @param oidv the OID of the extended response type.
      */
     void setResponseName( String oid );
-
-
-    /**
-     * Gets the response OID specific encoded response values.
-     * 
-     * @return the response specific encoded response values.
-     */
-    byte[] getResponseValue();
-
-
-    /**
-     * Sets the response OID specific encoded response values.
-     * 
-     * @param responseValue the response specific encoded response values.
-     */
-    void setResponseValue( byte[] responseValue );
 }

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImpl.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImpl.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImpl.java Mon Feb 21 02:02:24 2011
@@ -20,15 +20,10 @@
 package org.apache.directory.shared.ldap.model.message;
 
 
-import java.util.Arrays;
-
-import org.apache.directory.shared.util.Strings;
-
-
 /**
- * ExtendedResponse implementation
+ * A simple ExtendedResponse implementation.
  * 
- * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 public class ExtendedResponseImpl extends AbstractResultResponse implements ExtendedResponse
 {
@@ -37,9 +32,6 @@ public class ExtendedResponseImpl extend
     /** Object identifier for the extended response */
     protected String responseName;
 
-    /** Value encoded in the extended response payload */
-    protected byte[] responseValue;
-
 
     /**
      * Creates an ExtendedResponse as a reply to an ExtendedRequest.
@@ -80,25 +72,20 @@ public class ExtendedResponseImpl extend
     // ------------------------------------------------------------------------
     // ExtendedResponse Interface Method Implementations
     // ------------------------------------------------------------------------
+
+
     /**
-     * Sets the response OID specific encoded response value.
+     * Gets the OID uniquely identifying this extended response (a.k.a. its
+     * name).
      * 
-     * @param responseValue the response specific encoded response values.
+     * @return the responseName of the extended response
      */
-    public void setResponseValue( byte[] responseValue )
+    public String getResponseName()
     {
-        if ( responseValue != null )
-        {
-            this.responseValue = new byte[responseValue.length];
-            System.arraycopy( responseValue, 0, this.responseValue, 0, responseValue.length );
-        }
-        else
-        {
-            this.responseValue = null;
-        }
+        return ( ( responseName == null ) ? "" : responseName.toString() );
     }
 
-
+    
     /**
      * Sets the OID uniquely identifying this extended response (a.k.a. its
      * name).
@@ -124,11 +111,6 @@ public class ExtendedResponseImpl extend
             hash = hash * 17 + responseName.hashCode();
         }
 
-        if ( responseValue != null )
-        {
-            hash = hash * 17 + Arrays.hashCode( responseValue );
-        }
-
         hash = hash * 17 + super.hashCode();
 
         return hash;
@@ -177,68 +159,7 @@ public class ExtendedResponseImpl extend
             return false;
         }
 
-        if ( ( responseValue != null ) && ( resp.getResponseValue() == null ) )
-        {
-            return false;
-        }
-
-        if ( ( responseValue == null ) && ( resp.getResponseValue() != null ) )
-        {
-            return false;
-        }
-
-        return ( ( responseValue == null ) || ( resp.getResponseValue() == null )
-            || Arrays.equals( responseValue, resp.getResponseValue() ) );
-    }
-
-
-    /**
-     * Gets the OID uniquely identifying this extended response (a.k.a. its
-     * name).
-     * 
-     * @return the responseName of the extended response
-     */
-    public String getResponseName()
-    {
-        return ( ( responseName == null ) ? "" : responseName.toString() );
-    }
-
-
-    /**
-     * Gets the response OID specific encoded response values.
-     * 
-     * @return the response specific encoded response value
-     */
-    public byte[] getResponseValue()
-    {
-        if ( responseValue == null )
-        {
-            return null;
-        }
-
-        final byte[] copy = new byte[responseValue.length];
-        System.arraycopy( responseValue, 0, copy, 0, responseValue.length );
-        return copy;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     * @deprecated Use the {@link #getResponseValue()} method
-     */
-    public byte[] getEncodedValue()
-    {
-        return getResponseValue();
-    }
-
-
-    /**
-     * {@inheritDoc}
-     * @deprecated Use the {@link #getResponseName()} method
-     */
-    public String getID()
-    {
-        return getResponseName();
+        return true;
     }
 
 
@@ -258,11 +179,6 @@ public class ExtendedResponseImpl extend
             sb.append( "        ResponseName :'" ).append( responseName ).append( "'\n" );
         }
 
-        if ( responseValue != null )
-        {
-            sb.append( "        ResponseValue :'" ).append( Strings.dumpBytes(responseValue) ).append( "'\n" );
-        }
-
         sb.append( super.toString() );
 
         return super.toString( sb.toString() );

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ManyReplyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ManyReplyRequest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ManyReplyRequest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ManyReplyRequest.java Mon Feb 21 02:02:24 2011
@@ -26,7 +26,7 @@ package org.apache.directory.shared.ldap
  * 
  * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
  */
-public interface ManyReplyRequest extends ResultResponseRequest
+public interface ManyReplyRequest<R extends ResultResponse> extends ResultResponseRequest<R>
 {
     /**
      * Gets the various types of messages that can be generated by this kind of

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequest.java Mon Feb 21 02:02:24 2011
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.ldap.model.message;
 
+
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.Rdn;
 
@@ -64,7 +65,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface ModifyDnRequest extends SingleReplyRequest, AbandonableRequest
+public interface ModifyDnRequest extends SingleReplyRequest<ModifyDnResponse>, AbandonableRequest
 {
     /** Modify Dn request message type enumeration value */
     MessageTypeEnum TYPE = MessageTypeEnum.MODIFYDN_REQUEST;

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImpl.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImpl.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImpl.java Mon Feb 21 02:02:24 2011
@@ -218,7 +218,7 @@ public class ModifyDnRequestImpl extends
      * 
      * @return the result containing response for this request
      */
-    public ResultResponse getResultResponse()
+    public ModifyDnResponse getResultResponse()
     {
         if ( response == null )
         {

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequest.java Mon Feb 21 02:02:24 2011
@@ -96,7 +96,7 @@ import org.apache.directory.shared.ldap.
  *  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * 
  */
-public interface ModifyRequest extends SingleReplyRequest, AbandonableRequest
+public interface ModifyRequest extends SingleReplyRequest<ModifyResponse>, AbandonableRequest
 {
     /** Modify request message type enumeration value */
     MessageTypeEnum TYPE = MessageTypeEnum.MODIFY_REQUEST;

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImpl.java Mon Feb 21 02:02:24 2011
@@ -291,7 +291,7 @@ public class ModifyRequestImpl extends A
      * 
      * @return the result containing response for this request
      */
-    public ResultResponse getResultResponse()
+    public ModifyResponse getResultResponse()
     {
         if ( response == null )
         {

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ResultResponseRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ResultResponseRequest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ResultResponseRequest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/ResultResponseRequest.java Mon Feb 21 02:02:24 2011
@@ -25,7 +25,7 @@ package org.apache.directory.shared.ldap
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface ResultResponseRequest extends Request
+public interface ResultResponseRequest<R extends ResultResponse> extends Request
 {
     /**
      * If called for the first time, this methohd creates a result containing
@@ -34,5 +34,5 @@ public interface ResultResponseRequest e
      * @return a result containing response with defaults and the messageId set
      *         in response to this specific request
      */
-    ResultResponse getResultResponse();
+    R getResultResponse();
 }

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequest.java Mon Feb 21 02:02:24 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
  * 
  * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
  */
-public interface SearchRequest extends ManyReplyRequest, AbandonableRequest
+public interface SearchRequest extends ManyReplyRequest<SearchResultDone>, AbandonableRequest
 {
     /**
      * Different response types that a search request may return. A search

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequestImpl.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequestImpl.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SearchRequestImpl.java Mon Feb 21 02:02:24 2011
@@ -351,7 +351,7 @@ public class SearchRequestImpl extends A
      * 
      * @return the result containing response for this request
      */
-    public ResultResponse getResultResponse()
+    public SearchResultDone getResultResponse()
     {
         if ( response == null )
         {

Modified: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SingleReplyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SingleReplyRequest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SingleReplyRequest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/message/SingleReplyRequest.java Mon Feb 21 02:02:24 2011
@@ -25,7 +25,7 @@ package org.apache.directory.shared.ldap
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface SingleReplyRequest extends ResultResponseRequest
+public interface SingleReplyRequest<R extends ResultResponse> extends ResultResponseRequest<R>
 {
     /**
      * Gets the protocol response message type for this request which produces

Modified: directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java Mon Feb 21 02:02:24 2011
@@ -286,7 +286,7 @@ public class AddRequestImplTest
             }
 
 
-            public ResultResponse getResultResponse()
+            public AddResponse getResultResponse()
             {
                 return null;
             }

Modified: directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/BindRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/BindRequestImplTest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/BindRequestImplTest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/BindRequestImplTest.java Mon Feb 21 02:02:24 2011
@@ -324,7 +324,7 @@ public class BindRequestImplTest
             }
 
 
-            public ResultResponse getResultResponse()
+            public BindResponse getResultResponse()
             {
                 return null;
             }

Modified: directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java Mon Feb 21 02:02:24 2011
@@ -289,7 +289,7 @@ public class CompareRequestImplTest
             }
 
 
-            public ResultResponse getResultResponse()
+            public CompareResponse getResultResponse()
             {
                 return null;
             }

Modified: directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImplTest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImplTest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImplTest.java Mon Feb 21 02:02:24 2011
@@ -221,7 +221,7 @@ public class DeleteRequestImplTest
             }
 
 
-            public ResultResponse getResultResponse()
+            public DeleteResponse getResultResponse()
             {
                 return null;
             }

Modified: directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java Mon Feb 21 02:02:24 2011
@@ -64,11 +64,9 @@ public class ExtendedRequestImplTest
     {
         ExtendedRequestImpl req0 = new ExtendedRequestImpl( 5 );
         req0.setRequestName( "1.1.1.1" );
-        req0.setRequestValue( "Hello World!".getBytes() );
 
         ExtendedRequestImpl req1 = new ExtendedRequestImpl( 5 );
         req1.setRequestName( "1.1.1.1" );
-        req1.setRequestValue( "Hello World!".getBytes() );
 
         assertTrue( req0.equals( req1 ) );
         assertTrue( req1.equals( req0 ) );
@@ -94,11 +92,9 @@ public class ExtendedRequestImplTest
     {
         ExtendedRequestImpl req0 = new ExtendedRequestImpl( 5 );
         req0.setRequestName( "1.1.1.1" );
-        req0.setRequestValue( "Hello World!".getBytes() );
 
         ExtendedRequestImpl req1 = new ExtendedRequestImpl( 5 );
         req1.setRequestName( "1.1.1.1" );
-        req1.setRequestValue( "Hello World!".getBytes() );
 
         assertTrue( req0.hashCode() == req1.hashCode() );
     }
@@ -126,11 +122,9 @@ public class ExtendedRequestImplTest
     {
         ExtendedRequestImpl req0 = new ExtendedRequestImpl( 5 );
         req0.setRequestName( "1.1.1.1" );
-        req0.setRequestValue( "Hello World!".getBytes() );
 
         ExtendedRequestImpl req1 = new ExtendedRequestImpl( 5 );
         req0.setRequestName( "1.2.2.1" );
-        req0.setRequestValue( "Hello World!".getBytes() );
 
         assertFalse( req0.equals( req1 ) );
         assertFalse( req1.equals( req0 ) );
@@ -145,11 +139,9 @@ public class ExtendedRequestImplTest
     {
         ExtendedRequestImpl req0 = new ExtendedRequestImpl( 5 );
         req0.setRequestName( "1.1.1.1" );
-        req0.setRequestValue( "Hello ".getBytes() );
 
         ExtendedRequestImpl req1 = new ExtendedRequestImpl( 5 );
         req0.setRequestName( "1.1.1.1" );
-        req0.setRequestValue( "World!".getBytes() );
 
         assertFalse( req0.equals( req1 ) );
         assertFalse( req1.equals( req0 ) );
@@ -163,7 +155,7 @@ public class ExtendedRequestImplTest
     @Test
     public void testEqualsDiffImpl()
     {
-        ExtendedRequest req0 = new ExtendedRequest()
+        ExtendedRequest<?> req0 = new ExtendedRequest<ExtendedResponse>()
         {
             private static final long serialVersionUID = 1L;
 
@@ -173,17 +165,6 @@ public class ExtendedRequestImplTest
             }
 
 
-            public byte[] getRequestValue()
-            {
-                return null;
-            }
-
-
-            public void setRequestValue( byte[] payload )
-            {
-            }
-
-
             public MessageTypeEnum getResponseType()
             {
                 return MessageTypeEnum.EXTENDED_RESPONSE;
@@ -236,7 +217,7 @@ public class ExtendedRequestImplTest
             }
 
 
-            public ResultResponse getResultResponse()
+            public ExtendedResponse getResultResponse()
             {
                 return null;
             }

Modified: directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImplTest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImplTest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImplTest.java Mon Feb 21 02:02:24 2011
@@ -56,7 +56,6 @@ public class ExtendedResponseImplTest
     {
         // Construct the Search response to test with results and referrals
         ExtendedResponseImpl response = new ExtendedResponseImpl( 45 );
-        response.setResponseValue( "Hello World!".getBytes() );
         response.setResponseName( "1.1.1.1" );
         LdapResult result = response.getLdapResult();
 
@@ -115,12 +114,6 @@ public class ExtendedResponseImplTest
             private static final long serialVersionUID = 5297000474419901408L;
 
 
-            public String getID()
-            {
-                return "1.1.1.1";
-            }
-
-
             public String getResponseName()
             {
                 return "1.1.1.1";
@@ -132,23 +125,6 @@ public class ExtendedResponseImplTest
             }
 
 
-            public byte[] getEncodedValue()
-            {
-                return "Hello World!".getBytes();
-            }
-
-
-            public byte[] getResponseValue()
-            {
-                return "Hello World!".getBytes();
-            }
-
-
-            public void setResponseValue( byte[] value )
-            {
-            }
-
-
             public LdapResult getLdapResult()
             {
                 LdapResultImpl result = new LdapResultImpl();
@@ -300,9 +276,7 @@ public class ExtendedResponseImplTest
     public void testNotEqualsDiffResponses()
     {
         ExtendedResponseImpl resp0 = createStub();
-        resp0.setResponseValue( "abc".getBytes() );
         ExtendedResponseImpl resp1 = createStub();
-        resp1.setResponseValue( "123".getBytes() );
 
         assertFalse( resp0.equals( resp1 ) );
         assertFalse( resp1.equals( resp0 ) );

Modified: directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImplTest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImplTest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImplTest.java Mon Feb 21 02:02:24 2011
@@ -381,7 +381,7 @@ public class ModifyDnRequestImplTest
             }
 
 
-            public ResultResponse getResultResponse()
+            public ModifyDnResponse getResultResponse()
             {
                 return null;
             }

Modified: directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java?rev=1072822&r1=1072821&r2=1072822&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java (original)
+++ directory/shared/branches/akarasulu/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java Mon Feb 21 02:02:24 2011
@@ -410,7 +410,7 @@ public class ModifyRequestImplTest
             }
 
 
-            public ResultResponse getResultResponse()
+            public ModifyResponse getResultResponse()
             {
                 return null;
             }



Mime
View raw message