Author: akarasulu
Date: Tue Jan 25 02:29:08 2011
New Revision: 1063106
URL: http://svn.apache.org/viewvc?rev=1063106&view=rev
Log:
added encoding decorator to decouple ExtendedRequestImpl
Added:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ExtendedRequestDecorator.java
- copied, changed from r1063097, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/FooDecorator.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImpl.java
(contents, props changed)
- copied, changed from r1063086, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java
(contents, props changed)
- copied, changed from r1063063, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java
Removed:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java
Modified:
directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiRequest.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java
Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java?rev=1063106&r1=1063105&r2=1063106&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
(original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
Tue Jan 25 02:29:08 2011
@@ -40,7 +40,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ExtendedRequestImpl;
import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.model.name.Dn;
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=1063106&r1=1063105&r2=1063106&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
Tue Jan 25 02:29:08 2011
@@ -21,14 +21,9 @@ package org.apache.directory.server.ldap
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
-import org.apache.directory.shared.ldap.model.message.Request;
+import org.apache.directory.shared.ldap.model.message.*;
+import org.apache.directory.shared.ldap.model.message.ExtendedRequestImpl;
import org.apache.directory.shared.ldap.model.exception.ResponseCarryingMessageException;
-import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.model.message.ResultResponse;
-import org.apache.directory.shared.ldap.model.message.ResultResponseRequest;
-import org.apache.directory.shared.ldap.model.message.Control;
import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
import org.apache.directory.shared.ldap.message.spi.BinaryAttributeDetector;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=1063106&r1=1063105&r2=1063106&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
(original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
Tue Jan 25 02:29:08 2011
@@ -66,7 +66,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.CompareRequestImpl;
import org.apache.directory.shared.ldap.model.message.DeleteRequestImpl;
import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ExtendedRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyDnRequest;
import org.apache.directory.shared.ldap.message.ModifyDnRequestImpl;
import org.apache.directory.shared.ldap.model.message.ModifyRequest;
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java?rev=1063106&r1=1063105&r2=1063106&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
(original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
Tue Jan 25 02:29:08 2011
@@ -23,8 +23,8 @@ package org.apache.directory.shared.dsml
import org.apache.directory.shared.asn1.util.OID;
import org.apache.directory.shared.dsmlv2.ParserUtils;
import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
+import org.apache.directory.shared.ldap.model.message.ExtendedRequestImpl;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
import org.dom4j.Element;
import org.dom4j.Namespace;
import org.dom4j.QName;
Modified: directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1063106&r1=1063105&r2=1063106&view=diff
==============================================================================
--- directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
(original)
+++ directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
Tue Jan 25 02:29:08 2011
@@ -92,7 +92,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.DeleteRequestImpl;
import org.apache.directory.shared.ldap.model.message.DeleteResponse;
import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ExtendedRequestImpl;
import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
import org.apache.directory.shared.ldap.model.message.IntermediateResponse;
import org.apache.directory.shared.ldap.message.IntermediateResponseImpl;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=1063106&r1=1063105&r2=1063106&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
Tue Jan 25 02:29:08 2011
@@ -88,7 +88,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.DeleteResponse;
import org.apache.directory.shared.ldap.model.message.DeleteResponseImpl;
import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ExtendedRequestImpl;
import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
import org.apache.directory.shared.ldap.message.IntermediateResponseImpl;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java?rev=1063106&r1=1063105&r2=1063106&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapEncoder.java
Tue Jan 25 02:29:08 2011
@@ -723,11 +723,12 @@ public class LdapEncoder
*
* Length(ExtendedRequest) = Length(0x77) + Length(L1) + L1
*/
- private int computeExtendedRequestLength( ExtendedRequestImpl extendedRequest )
+ private int computeExtendedRequestLength( ExtendedRequestDecorator decorator )
{
+ ExtendedRequest extendedRequest = decorator.getExtendedRequest();
byte[] requestNameBytes = Strings.getBytesUtf8(extendedRequest.getRequestName());
- extendedRequest.setRequestNameBytes( requestNameBytes );
+ decorator.setRequestNameBytes( requestNameBytes );
int extendedRequestLength = 1 + TLV.getNbBytes( requestNameBytes.length ) + requestNameBytes.length;
@@ -737,7 +738,7 @@ public class LdapEncoder
+ extendedRequest.getRequestValue().length;
}
- extendedRequest.setExtendedRequestLength( extendedRequestLength );
+ decorator.setExtendedRequestLength( extendedRequestLength );
return 1 + TLV.getNbBytes( extendedRequestLength ) + extendedRequestLength;
}
@@ -1755,27 +1756,28 @@ public class LdapEncoder
* @param buffer The buffer where to put the PDU
* @return The PDU.
*/
- private void encodeExtendedRequest( ByteBuffer buffer, ExtendedRequestImpl extendedRequest
)
+ private void encodeExtendedRequest( ByteBuffer buffer, ExtendedRequestDecorator decorator
)
throws EncoderException
{
+ ExtendedRequest extendedRequest = decorator.getExtendedRequest();
try
{
// The BindResponse Tag
buffer.put( LdapConstants.EXTENDED_REQUEST_TAG );
- buffer.put( TLV.getBytes( extendedRequest.getExtendedRequestLength() ) );
+ buffer.put( TLV.getBytes( decorator.getExtendedRequestLength() ) );
// The requestName, if any
- if ( extendedRequest.getRequestNameBytes() == null )
+ if ( decorator.getRequestNameBytes() == null )
{
throw new EncoderException( I18n.err( I18n.ERR_04043 ) );
}
buffer.put( ( byte ) LdapConstants.EXTENDED_REQUEST_NAME_TAG );
- buffer.put( TLV.getBytes( extendedRequest.getRequestNameBytes().length ) );
+ buffer.put( TLV.getBytes( decorator.getRequestNameBytes().length ) );
- if ( extendedRequest.getRequestNameBytes().length != 0 )
+ if ( decorator.getRequestNameBytes().length != 0 )
{
- buffer.put( extendedRequest.getRequestNameBytes() );
+ buffer.put( decorator.getRequestNameBytes() );
}
// The requestValue, if any
@@ -2402,7 +2404,7 @@ public class LdapEncoder
return computeDeleteResponseLength( ( DeleteResponseDecorator ) decorator
);
case EXTENDED_REQUEST:
- return computeExtendedRequestLength( ( ExtendedRequestImpl ) message );
+ return computeExtendedRequestLength( ( ExtendedRequestDecorator ) decorator
);
case EXTENDED_RESPONSE:
return computeExtendedResponseLength( ( ExtendedResponseImpl ) message );
@@ -2486,7 +2488,7 @@ public class LdapEncoder
break;
case EXTENDED_REQUEST:
- encodeExtendedRequest( bb, ( ExtendedRequestImpl ) message );
+ encodeExtendedRequest( bb, ( ExtendedRequestDecorator ) decorator );
break;
case EXTENDED_RESPONSE:
Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ExtendedRequestDecorator.java
(from r1063097, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/FooDecorator.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ExtendedRequestDecorator.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ExtendedRequestDecorator.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/FooDecorator.java&r1=1063097&r2=1063106&rev=1063106&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/FooDecorator.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/ExtendedRequestDecorator.java
Tue Jan 25 02:29:08 2011
@@ -20,9 +20,7 @@
package org.apache.directory.shared.ldap.message.decorators;
-import org.apache.directory.shared.ldap.model.message.AddRequest;
-
-import java.util.List;
+import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
/**
@@ -30,22 +28,71 @@ import java.util.List;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class FooDecorator extends MessageDecorator
+public class ExtendedRequestDecorator extends MessageDecorator
{
+ /** The extended request length */
+ private int extendedRequestLength;
+
+ /** The OID length */
+ private byte[] requestNameBytes;
+
+
/**
- * Makes a Foo encodable.
+ * Makes a ExtendedRequest encodable.
*
- * @param decoratedMessage the decorated Foo
+ * @param decoratedMessage the decorated ExtendedRequest
*/
- public FooDecorator( AddRequest decoratedMessage )
+ public ExtendedRequestDecorator( ExtendedRequest decoratedMessage )
{
super( decoratedMessage );
}
- public AddRequest getAddRequest()
+ public ExtendedRequest getExtendedRequest()
+ {
+ return ( ExtendedRequest ) getMessage();
+ }
+
+
+ /**
+ * Stores the encoded length for the ExtendedRequest
+ *
+ * @param extendedRequestLength The encoded length
+ */
+ public void setExtendedRequestLength( int extendedRequestLength )
+ {
+ this.extendedRequestLength = extendedRequestLength;
+ }
+
+
+ /**
+ * @return The encoded ExtendedRequest's length
+ */
+ public int getExtendedRequestLength()
+ {
+ return extendedRequestLength;
+ }
+
+
+ /**
+ * Gets the requestName bytes.
+ *
+ * @return the requestName bytes of the extended request type.
+ */
+ public byte[] getRequestNameBytes()
+ {
+ return requestNameBytes;
+ }
+
+
+ /**
+ * Sets the requestName bytes.
+ *
+ * @param requestNameBytes the OID bytes of the extended request type.
+ */
+ public void setRequestNameBytes( byte[] requestNameBytes )
{
- return ( AddRequest ) getMessage();
+ this.requestNameBytes = requestNameBytes;
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java?rev=1063106&r1=1063105&r2=1063106&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/decorators/MessageDecorator.java
Tue Jan 25 02:29:08 2011
@@ -67,6 +67,8 @@ public class MessageDecorator
return new MessageDecorator( decoratedMessage );
case DEL_RESPONSE:
return new DeleteResponseDecorator( ( DeleteResponse ) decoratedMessage );
+ case EXTENDED_REQUEST:
+ return new ExtendedRequestDecorator( ( ExtendedRequest ) decoratedMessage
);
default:
return new MessageDecorator( decoratedMessage );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java?rev=1063106&r1=1063105&r2=1063106&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java
Tue Jan 25 02:29:08 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.extended.operations.cancel.Cancel;
import org.apache.directory.shared.ldap.codec.extended.operations.cancel.CancelDecoder;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ExtendedRequestImpl;
import org.apache.directory.shared.ldap.model.message.ResultResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java?rev=1063106&r1=1063105&r2=1063106&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java
Tue Jan 25 02:29:08 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.extended.operations.certGeneration.CertGenerationDecoder;
import org.apache.directory.shared.ldap.codec.extended.operations.certGeneration.CertGenerationObject;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ExtendedRequestImpl;
import org.apache.directory.shared.ldap.model.message.ResultResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java?rev=1063106&r1=1063105&r2=1063106&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java
Tue Jan 25 02:29:08 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.extended.operations.gracefulShutdown.GracefulShutdown;
import org.apache.directory.shared.ldap.codec.extended.operations.gracefulShutdown.GracefulShutdownDecoder;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ExtendedRequestImpl;
import org.apache.directory.shared.ldap.model.message.ResultResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiRequest.java?rev=1063106&r1=1063105&r2=1063106&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiRequest.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiRequest.java
Tue Jan 25 02:29:08 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.ldap
import javax.naming.ldap.ExtendedResponse;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ExtendedRequestImpl;
/**
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java?rev=1063106&r1=1063105&r2=1063106&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java
Tue Jan 25 02:29:08 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedureContainer;
import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedureDecoder;
import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedure.StoredProcedureParameter;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
+import org.apache.directory.shared.ldap.model.message.ExtendedRequestImpl;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImpl.java
(from r1063086, directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImpl.java?p2=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImpl.java&p1=directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java&r1=1063086&r2=1063106&rev=1063106&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java
(original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImpl.java
Tue Jan 25 02:29:08 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.model.message;
import java.util.Arrays;
@@ -25,6 +25,7 @@ import java.util.Arrays;
import javax.naming.NamingException;
import javax.naming.ldap.ExtendedResponse;
+import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
import org.apache.directory.shared.ldap.model.message.AbstractRequest;
import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
@@ -50,16 +51,6 @@ public class ExtendedRequestImpl extends
/** The associated response */
protected ResultResponse response;
- /** The extended request length */
- private int extendedRequestLength;
-
- /** The OID length */
- private byte[] requestNameBytes;
-
-
- // -----------------------------------------------------------------------
- // Constructors
- // -----------------------------------------------------------------------
/**
* Creates an ExtendedRequest implementing object used to perform
@@ -277,48 +268,6 @@ public class ExtendedRequestImpl extends
/**
- * Stores the encoded length for the ExtendedRequest
- *
- * @param extendedRequestLength The encoded length
- */
- /* No qualifier*/void setExtendedRequestLength( int extendedRequestLength )
- {
- this.extendedRequestLength = extendedRequestLength;
- }
-
-
- /**
- * @return The encoded ExtendedRequest's length
- */
- /* No qualifier*/int getExtendedRequestLength()
- {
- return extendedRequestLength;
- }
-
-
- /**
- * Gets the requestName bytes.
- *
- * @return the requestName bytes of the extended request type.
- */
- /* No qualifier*/byte[] getRequestNameBytes()
- {
- return requestNameBytes;
- }
-
-
- /**
- * Sets the requestName bytes.
- *
- * @param requestNameBytes the OID bytes of the extended request type.
- */
- /* No qualifier*/void setRequestNameBytes( byte[] requestNameBytes )
- {
- this.requestNameBytes = requestNameBytes;
- }
-
-
- /**
* Get a String representation of an Extended Request
*
* @return an Extended Request String
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java
(from r1063063, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java?p2=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java&p1=directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java&r1=1063063&r2=1063106&rev=1063106&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java
Tue Jan 25 02:29:08 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.model.message;
import static org.junit.Assert.assertFalse;
@@ -32,10 +32,7 @@ import javax.naming.ldap.ExtendedRespons
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
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.ExtendedRequest;
-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.*;
import org.junit.Test;
import org.junit.runner.RunWith;
Propchange: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java
------------------------------------------------------------------------------
svn:eol-style = native
|