You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2009/04/11 03:03:25 UTC
svn commit: r764131 [8/16] - in /directory: apacheds/trunk/
apacheds/trunk/core-avl/
apacheds/trunk/core-avl/src/main/java/org/apache/directory/server/core/avltree/
apacheds/trunk/core-avl/src/test/java/org/apache/directory/server/core/avltree/
apached...
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlGrammar.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/replication/syncRequestValue/SyncRequestValueControlStatesEnum.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlCodec.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlContainer.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlDecoder.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlGrammar.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/entryChange/EntryChangeControlStatesEnum.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pSearch/PSearchControlCodec.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pSearch/PSearchControlContainer.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pSearch/PSearchControlDecoder.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pSearch/PSearchControlGrammar.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pSearch/PSearchControlStatesEnum.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedSearchControlCodec.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedSearchControlContainer.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedSearchControlDecoder.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedSearchControlGrammar.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/pagedSearch/PagedSearchControlStatesEnum.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subEntry/SubEntryControlCodec.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subEntry/SubEntryControlContainer.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subEntry/SubEntryControlDecoder.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subEntry/SubEntryControlGrammar.java
('svn:mergeinfo' removed)
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/subEntry/SubEntryControlStatesEnum.java
('svn:mergeinfo' removed)
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonListener.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonListener.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonListener.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonListener.java Sat Apr 11 01:03:00 2009
@@ -34,5 +34,5 @@
* @param req
* the request which is abandoned.
*/
- void requestAbandoned( AbandonableRequest req );
+ void requestAbandoned( InternalAbandonableRequest req );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java Sat Apr 11 01:03:00 2009
@@ -26,7 +26,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class AbandonRequestImpl extends AbstractRequest implements AbandonRequest
+public class AbandonRequestImpl extends InternalAbstractRequest implements InternalAbandonRequest
{
static final long serialVersionUID = -4688193359792740969L;
@@ -85,7 +85,7 @@
return true;
}
- if ( ( obj == null ) || !( obj instanceof AbandonRequest ) )
+ if ( ( obj == null ) || !( obj instanceof InternalAbandonRequest ) )
{
return false;
}
@@ -95,7 +95,7 @@
return false;
}
- AbandonRequest req = ( AbandonRequest ) obj;
+ InternalAbandonRequest req = ( InternalAbandonRequest ) obj;
if ( req.getAbandoned() != abandonId )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractAbandonableRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractAbandonableRequest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractAbandonableRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractAbandonableRequest.java Sat Apr 11 01:03:00 2009
@@ -31,7 +31,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class AbstractAbandonableRequest extends AbstractRequest implements AbandonableRequest
+public class AbstractAbandonableRequest extends InternalAbstractRequest implements InternalAbandonableRequest
{
static final long serialVersionUID = -4511116249089399040L;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java Sat Apr 11 01:03:00 2009
@@ -32,14 +32,14 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class AddRequestImpl extends AbstractAbandonableRequest implements AddRequest
+public class AddRequestImpl extends AbstractAbandonableRequest implements InternalAddRequest
{
static final long serialVersionUID = 7534132448349520346L;
/** A MultiMap of the new entry's attributes and their values */
private Entry entry;
- private AddResponse response;
+ private InternalAddResponse response;
// ------------------------------------------------------------------------
@@ -128,7 +128,7 @@
*
* @return the result containing response for this request
*/
- public ResultResponse getResultResponse()
+ public InternalResultResponse getResultResponse()
{
if ( response == null )
{
@@ -161,7 +161,7 @@
}
// Check the object class. If null, it will exit.
- if ( !( obj instanceof AddRequest ) )
+ if ( !( obj instanceof InternalAddRequest ) )
{
return false;
}
@@ -171,7 +171,7 @@
return false;
}
- AddRequest req = ( AddRequest ) obj;
+ InternalAddRequest req = ( InternalAddRequest ) obj;
// Check the entry
if ( entry == null )
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java Sat Apr 11 01:03:00 2009
@@ -26,7 +26,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class AddResponseImpl extends AbstractResultResponse implements AddResponse
+public class AddResponseImpl extends InternalAbstractResultResponse implements InternalAddResponse
{
// ------------------------------------------------------------------------
// Constructors
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java Sat Apr 11 01:03:00 2009
@@ -33,7 +33,7 @@
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
* @version $Rev$
*/
-public class BindRequestImpl extends AbstractRequest implements BindRequest
+public class BindRequestImpl extends AbstractAbandonableRequest implements InternalBindRequest
{
static final long serialVersionUID = 7945504184130380071L;
@@ -58,7 +58,7 @@
/** Bind behavoir exhibity by protocol version */
private boolean isVersion3 = true;
- public BindResponse response;
+ public InternalBindResponse response;
// ------------------------------------------------------------------------
@@ -73,7 +73,7 @@
*/
public BindRequestImpl(final int id)
{
- super( id, TYPE, true );
+ super( id, TYPE );
hCredentials = 0;
}
@@ -293,7 +293,7 @@
*
* @return the result containing response for this request
*/
- public ResultResponse getResultResponse()
+ public InternalResultResponse getResultResponse()
{
if ( response == null )
{
@@ -313,7 +313,7 @@
return true;
}
- if ( ( obj == null ) || !( obj instanceof BindRequest ) )
+ if ( ( obj == null ) || !( obj instanceof InternalBindRequest ) )
{
return false;
}
@@ -323,7 +323,7 @@
return false;
}
- BindRequest req = ( BindRequest ) obj;
+ InternalBindRequest req = ( InternalBindRequest ) obj;
if ( req.isSimple() != isSimple() )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java Sat Apr 11 01:03:00 2009
@@ -26,16 +26,16 @@
/**
- * Lockable BindResponse implementation.
+ * BindResponse implementation.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
* @version $Rev$
*/
-public class BindResponseImpl extends AbstractResultResponse implements BindResponse
+public class BindResponseImpl extends InternalAbstractResultResponse implements InternalBindResponse
{
static final long serialVersionUID = -5146809476518669755L;
- /** optional property holding SASL authentication response paramters */
+ /** optional property holding SASL authentication response parameters */
private byte[] serverSaslCreds;
@@ -118,7 +118,7 @@
return true;
}
- if ( ( obj == null ) || !( obj instanceof BindResponse ) )
+ if ( ( obj == null ) || !( obj instanceof InternalBindResponse ) )
{
return false;
}
@@ -128,7 +128,7 @@
return false;
}
- BindResponse response = ( BindResponse ) obj;
+ InternalBindResponse response = ( InternalBindResponse ) obj;
byte[] creds = response.getServerSaslCreds();
if ( serverSaslCreds == null )
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java Sat Apr 11 01:03:00 2009
@@ -33,7 +33,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class CompareRequestImpl extends AbstractAbandonableRequest implements CompareRequest
+public class CompareRequestImpl extends AbstractAbandonableRequest implements InternalCompareRequest
{
static final long serialVersionUID = 1699731530016468977L;
@@ -46,7 +46,7 @@
/** The value of the attribute used in the comparison */
private Value<?> attrVal;
- private CompareResponse response;
+ private InternalCompareResponse response;
// ------------------------------------------------------------------------
@@ -181,7 +181,7 @@
*
* @return the result containing response for this request
*/
- public ResultResponse getResultResponse()
+ public InternalResultResponse getResultResponse()
{
if ( response == null )
{
@@ -210,7 +210,7 @@
return false;
}
- CompareRequest req = ( CompareRequest ) obj;
+ InternalCompareRequest req = ( InternalCompareRequest ) obj;
LdapDN reqName = req.getName();
if ( ( name != null ) && ( reqName == null ) )
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java Sat Apr 11 01:03:00 2009
@@ -26,7 +26,7 @@
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
* @version $Rev$
*/
-public class CompareResponseImpl extends AbstractResultResponse implements CompareResponse
+public class CompareResponseImpl extends InternalAbstractResultResponse implements InternalCompareResponse
{
// ------------------------------------------------------------------------
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java Sat Apr 11 01:03:00 2009
@@ -28,14 +28,14 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class DeleteRequestImpl extends AbstractAbandonableRequest implements DeleteRequest
+public class DeleteRequestImpl extends AbstractAbandonableRequest implements InternalDeleteRequest
{
static final long serialVersionUID = 3187847454305567542L;
/** The distinguished name of the entry to delete */
private LdapDN name;
- private DeleteResponse response;
+ private InternalDeleteResponse response;
// ------------------------------------------------------------------------
@@ -105,7 +105,7 @@
*
* @return the result containing response for this request
*/
- public ResultResponse getResultResponse()
+ public InternalResultResponse getResultResponse()
{
if ( response == null )
{
@@ -139,7 +139,7 @@
return false;
}
- DeleteRequest req = ( DeleteRequest ) obj;
+ InternalDeleteRequest req = ( InternalDeleteRequest ) obj;
if ( name != null && req.getName() == null )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java Sat Apr 11 01:03:00 2009
@@ -26,7 +26,7 @@
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
* @version $Rev$
*/
-public class DeleteResponseImpl extends AbstractResultResponse implements DeleteResponse
+public class DeleteResponseImpl extends InternalAbstractResultResponse implements InternalDeleteResponse
{
// ------------------------------------------------------------------------
Modified: 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/message/ExtendedRequestImpl.java?rev=764131&r1=764130&r2=764131&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/message/ExtendedRequestImpl.java Sat Apr 11 01:03:00 2009
@@ -34,7 +34,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class ExtendedRequestImpl extends AbstractRequest implements ExtendedRequest
+public class ExtendedRequestImpl extends InternalAbstractRequest implements InternalExtendedRequest
{
static final long serialVersionUID = 7916990159044177480L;
@@ -44,7 +44,7 @@
/** Extended request's payload or <b>requestValue</b> */
protected byte[] payload;
- protected ResultResponse response;
+ protected InternalResultResponse response;
// -----------------------------------------------------------------------
@@ -151,7 +151,7 @@
*
* @return the result containing response for this request
*/
- public ResultResponse getResultResponse()
+ public InternalResultResponse getResultResponse()
{
if ( response == null )
{
@@ -181,12 +181,12 @@
return false;
}
- if ( !( obj instanceof ExtendedRequest ) )
+ if ( !( obj instanceof InternalExtendedRequest ) )
{
return false;
}
- ExtendedRequest req = ( ExtendedRequest ) obj;
+ InternalExtendedRequest req = ( InternalExtendedRequest ) obj;
if ( oid != null && req.getOid() == null )
{
return false;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java Sat Apr 11 01:03:00 2009
@@ -28,7 +28,7 @@
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
* @version $Rev$
*/
-public class ExtendedResponseImpl extends AbstractResultResponse implements ExtendedResponse
+public class ExtendedResponseImpl extends InternalAbstractResultResponse implements InternalExtendedResponse
{
static final long serialVersionUID = -6646752766410531060L;
@@ -152,12 +152,12 @@
return false;
}
- if ( !( obj instanceof ExtendedResponse ) )
+ if ( !( obj instanceof InternalExtendedResponse ) )
{
return false;
}
- ExtendedResponse resp = ( ExtendedResponse ) obj;
+ InternalExtendedResponse resp = ( InternalExtendedResponse ) obj;
if ( oid != null && resp.getResponseName() == null )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java Sat Apr 11 01:03:00 2009
@@ -29,7 +29,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Revision$
*/
-public class LdapResultImpl implements LdapResult
+public class LdapResultImpl implements InternalLdapResult
{
static final long serialVersionUID = -1446626887394613213L;
@@ -37,7 +37,7 @@
private LdapDN matchedDn;
/** Referral associated with this LdapResult if the errorCode is REFERRAL */
- private Referral referral;
+ private InternalReferral referral;
/** Decriptive error message - defaults to empty string */
private String errorMessage;
@@ -140,7 +140,7 @@
*
* @return the referral on REFERRAL errors, null on all others.
*/
- public Referral getReferral()
+ public InternalReferral getReferral()
{
return referral;
}
@@ -167,7 +167,7 @@
* @param referral
* optional referral on REFERRAL errors.
*/
- public void setReferral( Referral referral )
+ public void setReferral( InternalReferral referral )
{
this.referral = referral;
}
@@ -186,13 +186,13 @@
}
// return false if object does not implement interface
- if ( !( obj instanceof LdapResult ) )
+ if ( !( obj instanceof InternalLdapResult ) )
{
return false;
}
// compare all the like elements of the two LdapResult objects
- LdapResult result = ( LdapResult ) obj;
+ InternalLdapResult result = ( InternalLdapResult ) obj;
if ( referral == null && result.getReferral() != null )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManyReplyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManyReplyRequest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManyReplyRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManyReplyRequest.java Sat Apr 11 01:03:00 2009
@@ -27,7 +27,7 @@
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
* @version $Rev$
*/
-public interface ManyReplyRequest extends ResultResponseRequest
+public interface ManyReplyRequest extends InternalResultResponseRequest
{
/**
* Gets the various types of messages that can be generated by this kind of
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageEncoder.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageEncoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageEncoder.java Sat Apr 11 01:03:00 2009
@@ -71,7 +71,7 @@
public void encodeBlocking( Object lock, OutputStream out, Object obj ) throws ProviderException
{
// transform to build provider specific intermediate envelope
- Object providerEnvelope = TwixTransformer.transform( ( Message ) obj );
+ Object providerEnvelope = TwixTransformer.transform( ( InternalMessage ) obj );
// now encode provider's intermediate stub into a PDU onto stream
this.encoder.encodeBlocking( lock, out, providerEnvelope );
@@ -84,7 +84,7 @@
public ByteBuffer encodeBlocking( Object obj ) throws ProviderException
{
// transform to build provider specific intermediate envelope
- Object providerEnvelope = TwixTransformer.transform( ( Message ) obj );
+ Object providerEnvelope = TwixTransformer.transform( ( InternalMessage ) obj );
// now encode provider's intermediate stub into PDU in a byte buffer
return this.encoder.encodeBlocking( providerEnvelope );
@@ -118,7 +118,7 @@
public void encode( Object obj ) throws EncoderException
{
// transform to build provider specific intermediate envelope
- Object providerEnvelope = TwixTransformer.transform( ( Message ) obj );
+ Object providerEnvelope = TwixTransformer.transform( ( InternalMessage ) obj );
// now give intermediate envelope to provider's encoder
this.encoder.encode( providerEnvelope );
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java Sat Apr 11 01:03:00 2009
@@ -29,7 +29,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class ModifyDnRequestImpl extends AbstractAbandonableRequest implements ModifyDnRequest
+public class ModifyDnRequestImpl extends AbstractAbandonableRequest implements InternalModifyDnRequest
{
static final long serialVersionUID = 1233507339633051696L;
@@ -45,7 +45,7 @@
/** PDU's <b>deleteOldRdn</b> flag */
private boolean deleteOldRdn = false;
- private ModifyDnResponse response;
+ private InternalModifyDnResponse response;
// -----------------------------------------------------------------------
@@ -216,7 +216,7 @@
*
* @return the result containing response for this request
*/
- public ResultResponse getResultResponse()
+ public InternalResultResponse getResultResponse()
{
if ( response == null )
{
@@ -247,7 +247,7 @@
return false;
}
- ModifyDnRequest req = ( ModifyDnRequest ) obj;
+ InternalModifyDnRequest req = ( InternalModifyDnRequest ) obj;
if ( name != null && req.getName() == null )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java Sat Apr 11 01:03:00 2009
@@ -26,7 +26,7 @@
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
* @version $Rev$
*/
-public class ModifyDnResponseImpl extends AbstractResultResponse implements ModifyDnResponse
+public class ModifyDnResponseImpl extends InternalAbstractResultResponse implements InternalModifyDnResponse
{
// ------------------------------------------------------------------------
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java Sat Apr 11 01:03:00 2009
@@ -39,7 +39,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class ModifyRequestImpl extends AbstractAbandonableRequest implements ModifyRequest
+public class ModifyRequestImpl extends AbstractAbandonableRequest implements InternalModifyRequest
{
static final long serialVersionUID = -505803669028990304L;
@@ -52,7 +52,7 @@
/** Sequence of modifications or PDU's <b>modification</b> seqence field */
private List<Modification> mods = new ArrayList<Modification>();
- private ModifyResponse response;
+ private InternalModifyResponse response;
// ------------------------------------------------------------------------
@@ -157,7 +157,7 @@
*
* @return the result containing response for this request
*/
- public ResultResponse getResultResponse()
+ public InternalResultResponse getResultResponse()
{
if ( response == null )
{
@@ -188,7 +188,7 @@
return false;
}
- ModifyRequest req = ( ModifyRequest ) obj;
+ InternalModifyRequest req = ( InternalModifyRequest ) obj;
if ( name != null && req.getName() == null )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java Sat Apr 11 01:03:00 2009
@@ -25,7 +25,7 @@
*
* @version $Rev$
*/
-public class ModifyResponseImpl extends AbstractResultResponse implements ModifyResponse
+public class ModifyResponseImpl extends InternalAbstractResultResponse implements InternalModifyResponse
{
// ------------------------------------------------------------------------
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ReferralImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ReferralImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ReferralImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ReferralImpl.java Sat Apr 11 01:03:00 2009
@@ -35,7 +35,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class ReferralImpl implements Referral
+public class ReferralImpl implements InternalReferral
{
static final long serialVersionUID = 2638820668325359096L;
@@ -100,9 +100,9 @@
return true;
}
- if ( obj instanceof Referral )
+ if ( obj instanceof InternalReferral )
{
- Collection<String> refs = ( ( Referral ) obj ).getLdapUrls();
+ Collection<String> refs = ( ( InternalReferral ) obj ).getLdapUrls();
// if their sizes do not match they are not equal
if ( refs.size() != urls.size() )
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java Sat Apr 11 01:03:00 2009
@@ -41,7 +41,7 @@
private static final long serialVersionUID = 1L;
/** The response with the error cause */
- private Message response;
+ private InternalMessage response;
/**
* Constructs an Exception without a message.
@@ -67,7 +67,7 @@
* Set a response if we get an exception while parsing the message
* @param response the constructed response
*/
- public void setResponse( Message response )
+ public void setResponse( InternalMessage response )
{
this.response = response;
}
@@ -76,7 +76,7 @@
* Get the constructed response
* @return The constructed response
*/
- public Message getResponse()
+ public InternalMessage getResponse()
{
return response;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultCodeEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultCodeEnum.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultCodeEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultCodeEnum.java Sat Apr 11 01:03:00 2009
@@ -643,6 +643,45 @@
OTHER( 80 ),
/**
+ * This error code is returned when an operation has been canceled using
+ * the Cancel extended operation.
+ */
+ CANCELED( 118 ),
+
+
+ /**
+ * This error code is returned if the server has no knowledge of
+ * the operation requested for cancelation.
+ */
+ NO_SUCH_OPERATION( 119 ),
+
+
+ /**
+ * The tooLate resultCode is returned to indicate that it is too late to
+ * cancel the outstanding operation. For example, the server may return
+ * tooLate for a request to cancel an outstanding modify operation which
+ * has already committed updates to the underlying data store.
+ */
+ TOO_LATE( 120 ),
+
+ /**
+ * The cannotCancel resultCode is returned if the identified operation
+ * does not support cancelation or the cancel operation could not be
+ * performed. The following classes of operations are not cancelable:
+ *
+ * - operations which have no response,
+ *
+ * - operations which create, alter, or destroy authentication and/or
+ * authorization associations,
+ *
+ * - operations which establish, alter, or tear-down security services,
+ * and
+ *
+ * - operations which abandon or cancel other operations.
+ */
+ CANNOT_CANCEL( 121 ),
+
+ /**
* A unknown result code to cover all the other cases
*/
// -- 15 unused --
@@ -653,7 +692,7 @@
// -- 70 reserved for CLDAP --
// -- 72-79 unused --
// -- 81-90 reserved for APIs --
- UNKNOWN( 99 );
+ UNKNOWN( 122 );
/** Stores the integer value of each element of the enumeration */
private int value;
@@ -724,6 +763,7 @@
set.add( ResultCodeEnum.COMPARE_FALSE );
set.add( ResultCodeEnum.REFERRAL );
set.add( ResultCodeEnum.SASL_BIND_IN_PROGRESS );
+ set.add( ResultCodeEnum.CANCELED );
NON_ERRONEOUS_CODES = Collections.unmodifiableSet( set );
}
@@ -844,6 +884,9 @@
set.add( ResultCodeEnum.ADMIN_LIMIT_EXCEEDED );
set.add( ResultCodeEnum.UNWILLING_TO_PERFORM );
set.add( ResultCodeEnum.UNAVAILABLE_CRITICAL_EXTENSION );
+ set.add( ResultCodeEnum.CANNOT_CANCEL );
+ set.add( ResultCodeEnum.TOO_LATE );
+ set.add( ResultCodeEnum.NO_SUCH_OPERATION );
SERVICE_CODES = Collections.unmodifiableSet( set );
}
@@ -943,7 +986,7 @@
*/
public static final Set<ResultCodeEnum> BIND_CODES;
static
- {
+ {
Set<ResultCodeEnum> set = new HashSet<ResultCodeEnum>();
set.add( ResultCodeEnum.BUSY );
set.add( ResultCodeEnum.OTHER );
@@ -963,6 +1006,7 @@
set.add( ResultCodeEnum.CONFIDENTIALITY_REQUIRED );
set.add( ResultCodeEnum.INAPPROPRIATE_AUTHENTICATION );
set.add( ResultCodeEnum.UNAVAILABLE_CRITICAL_EXTENSION );
+ set.add( ResultCodeEnum.CANCELED );
BIND_CODES = Collections.unmodifiableSet( set );
}
@@ -1016,6 +1060,7 @@
set.add( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS );
set.add( ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM );
set.add( ResultCodeEnum.UNAVAILABLE_CRITICAL_EXTENSION );
+ set.add( ResultCodeEnum.CANCELED );
SEARCH_CODES = Collections.unmodifiableSet( set );
}
@@ -1077,6 +1122,7 @@
set.add( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS );
set.add( ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
set.add( ResultCodeEnum.UNAVAILABLE_CRITICAL_EXTENSION );
+ set.add( ResultCodeEnum.CANCELED );
MODIFY_CODES = Collections.unmodifiableSet( set );
}
@@ -1136,6 +1182,7 @@
set.add( ResultCodeEnum.CONFIDENTIALITY_REQUIRED );
set.add( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS );
set.add( ResultCodeEnum.UNAVAILABLE_CRITICAL_EXTENSION );
+ set.add( ResultCodeEnum.CANCELED );
ADD_CODES = Collections.unmodifiableSet( set );
}
@@ -1183,6 +1230,7 @@
set.add( ResultCodeEnum.CONFIDENTIALITY_REQUIRED );
set.add( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS );
set.add( ResultCodeEnum.UNAVAILABLE_CRITICAL_EXTENSION );
+ set.add( ResultCodeEnum.CANCELED );
DELETE_CODES = Collections.unmodifiableSet( set );
}
@@ -1240,6 +1288,7 @@
set.add( ResultCodeEnum.CONFIDENTIALITY_REQUIRED );
set.add( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS );
set.add( ResultCodeEnum.UNAVAILABLE_CRITICAL_EXTENSION );
+ set.add( ResultCodeEnum.CANCELED );
MODIFYDN_CODES = Collections.unmodifiableSet( set );
}
@@ -1293,6 +1342,7 @@
set.add( ResultCodeEnum.LOOP_DETECT );
set.add( ResultCodeEnum.REFERRAL );
set.add( ResultCodeEnum.OTHER );
+ set.add( ResultCodeEnum.CANCELED );
COMPARE_CODES = Collections.unmodifiableSet( set );
}
@@ -1385,6 +1435,7 @@
set.add( ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
set.add( ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
set.add( ResultCodeEnum.OTHER );
+ set.add( ResultCodeEnum.CANCELED );
EXTENDED_CODES = Collections.unmodifiableSet( set );
}
@@ -1481,6 +1532,10 @@
set.add( ResultCodeEnum.OBJECT_CLASS_MODS_PROHIBITED );
set.add( ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
set.add( ResultCodeEnum.OTHER );
+ set.add( ResultCodeEnum.CANNOT_CANCEL );
+ set.add( ResultCodeEnum.TOO_LATE );
+ set.add( ResultCodeEnum.NO_SUCH_OPERATION );
+ set.add( ResultCodeEnum.CANCELED );
ALL_CODES = Collections.unmodifiableSet( set );
}
@@ -1540,6 +1595,10 @@
case 69 : return OBJECT_CLASS_MODS_PROHIBITED;
case 71 : return AFFECTS_MULTIPLE_DSAS;
case 80 : return OTHER;
+ case 118: return CANCELED;
+ case 129: return NO_SUCH_OPERATION;
+ case 120: return TOO_LATE;
+ case 121: return CANNOT_CANCEL;
default : return UNKNOWN;
}
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java Sat Apr 11 01:03:00 2009
@@ -38,7 +38,7 @@
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
* @version $Rev$
*/
-public class SearchRequestImpl extends AbstractAbandonableRequest implements SearchRequest
+public class SearchRequestImpl extends AbstractAbandonableRequest implements InternalSearchRequest
{
static final long serialVersionUID = -5655881944020886218L;
@@ -67,7 +67,7 @@
private List<String> attributes = new ArrayList<String>();
/** The final result containing SearchResponseDone response */
- private SearchResponseDone response;
+ private InternalSearchResponseDone response;
// ------------------------------------------------------------------------
@@ -338,7 +338,7 @@
*
* @return the result containing response for this request
*/
- public ResultResponse getResultResponse()
+ public InternalResultResponse getResultResponse()
{
if ( response == null )
{
@@ -374,7 +374,7 @@
return false;
}
- SearchRequest req = ( SearchRequest ) obj;
+ InternalSearchRequest req = ( InternalSearchRequest ) obj;
if ( !req.getBase().equals( baseDn ) )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImpl.java Sat Apr 11 01:03:00 2009
@@ -26,7 +26,7 @@
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
* @version $Rev$
*/
-public class SearchResponseDoneImpl extends AbstractResultResponse implements SearchResponseDone
+public class SearchResponseDoneImpl extends InternalAbstractResultResponse implements InternalSearchResponseDone
{
// ------------------------------------------------------------------------
@@ -70,7 +70,7 @@
return false;
}
- LdapResult result = ( ( SearchResponseDone ) obj ).getLdapResult();
+ InternalLdapResult result = ( ( InternalSearchResponseDone ) obj ).getLdapResult();
if ( !getLdapResult().equals( result ) )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java Sat Apr 11 01:03:00 2009
@@ -30,7 +30,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class SearchResponseEntryImpl extends AbstractResponse implements SearchResponseEntry
+public class SearchResponseEntryImpl extends InternalAbstractResponse implements InternalSearchResponseEntry
{
static final long serialVersionUID = -8357316233060886637L;
@@ -126,12 +126,12 @@
return false;
}
- if ( !( obj instanceof SearchResponseEntry ) )
+ if ( !( obj instanceof InternalSearchResponseEntry ) )
{
return false;
}
- SearchResponseEntry resp = ( SearchResponseEntry ) obj;
+ InternalSearchResponseEntry resp = ( InternalSearchResponseEntry ) obj;
return entry.equals( resp.getEntry() );
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImpl.java Sat Apr 11 01:03:00 2009
@@ -26,12 +26,12 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Revision$
*/
-public class SearchResponseReferenceImpl extends AbstractResponse implements SearchResponseReference
+public class SearchResponseReferenceImpl extends InternalAbstractResponse implements InternalSearchResponseReference
{
static final long serialVersionUID = 7423807019951309810L;
/** Referral holding the reference urls */
- private Referral referral;
+ private InternalReferral referral;
// ------------------------------------------------------------------------
@@ -60,7 +60,7 @@
*
* @return the sequence of LdapUrls
*/
- public Referral getReferral()
+ public InternalReferral getReferral()
{
return this.referral;
}
@@ -72,7 +72,7 @@
* @param referral
* the sequence of LdapUrls
*/
- public void setReferral( Referral referral )
+ public void setReferral( InternalReferral referral )
{
this.referral = referral;
}
@@ -97,7 +97,7 @@
return false;
}
- SearchResponseReference resp = ( SearchResponseReference ) obj;
+ InternalSearchResponseReference resp = ( InternalSearchResponseReference ) obj;
if ( this.referral != null && resp.getReferral() == null )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SingleReplyRequest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SingleReplyRequest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SingleReplyRequest.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SingleReplyRequest.java Sat Apr 11 01:03:00 2009
@@ -26,7 +26,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public interface SingleReplyRequest extends ResultResponseRequest
+public interface SingleReplyRequest extends InternalResultResponseRequest
{
/**
* Gets the protocol response message type for this request which produces
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequestImpl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequestImpl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequestImpl.java Sat Apr 11 01:03:00 2009
@@ -25,7 +25,7 @@
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public class UnbindRequestImpl extends AbstractRequest implements UnbindRequest
+public class UnbindRequestImpl extends InternalAbstractRequest implements InternalUnbindRequest
{
static final long serialVersionUID = -6217184085100410116L;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/CascadeControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/CascadeControl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/CascadeControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/CascadeControl.java Sat Apr 11 01:03:00 2009
@@ -28,7 +28,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 437007 $
*/
-public class CascadeControl extends AbstractMutableControlImpl
+public class CascadeControl extends InternalAbstractControl
{
private static final long serialVersionUID = -2356861450876343999L;
public static final String CONTROL_OID = "1.3.6.1.4.1.18060.0.0.1";
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/EntryChangeControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/EntryChangeControl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/EntryChangeControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/EntryChangeControl.java Sat Apr 11 01:03:00 2009
@@ -75,7 +75,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class EntryChangeControl extends AbstractMutableControlImpl
+public class EntryChangeControl extends InternalAbstractControl
{
private static final long serialVersionUID = -2356861450876343999L;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/ManageDsaITControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/ManageDsaITControl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/ManageDsaITControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/ManageDsaITControl.java Sat Apr 11 01:03:00 2009
@@ -60,7 +60,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class ManageDsaITControl extends AbstractMutableControlImpl
+public class ManageDsaITControl extends InternalAbstractControl
{
public static final String CONTROL_OID = "2.16.840.1.113730.3.4.2";
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PagedSearchControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PagedSearchControl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PagedSearchControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PagedSearchControl.java Sat Apr 11 01:03:00 2009
@@ -58,7 +58,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 678621 $
*/
-public class PagedSearchControl extends AbstractMutableControlImpl
+public class PagedSearchControl extends InternalAbstractControl
{
private static final long serialVersionUID = -2356861450876343999L;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PersistentSearchControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PersistentSearchControl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PersistentSearchControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/PersistentSearchControl.java Sat Apr 11 01:03:00 2009
@@ -44,7 +44,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class PersistentSearchControl extends AbstractMutableControlImpl
+public class PersistentSearchControl extends InternalAbstractControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = -2356861450876343999L;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/SubentriesControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/SubentriesControl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/SubentriesControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/SubentriesControl.java Sat Apr 11 01:03:00 2009
@@ -67,7 +67,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$
*/
-public class SubentriesControl extends AbstractMutableControlImpl
+public class SubentriesControl extends InternalAbstractControl
{
private static final long serialVersionUID = -2356861450876343999L;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncDoneValueControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncDoneValueControl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncDoneValueControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncDoneValueControl.java Sat Apr 11 01:03:00 2009
@@ -22,7 +22,7 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.controls.replication.syncDoneValue.SyncDoneValueControlCodec;
-import org.apache.directory.shared.ldap.message.control.AbstractMutableControlImpl;
+import org.apache.directory.shared.ldap.message.control.InternalAbstractControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +41,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class SyncDoneValueControl extends AbstractMutableControlImpl
+public class SyncDoneValueControl extends InternalAbstractControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = 1L;
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncDoneValueControl.java
('svn:mergeinfo' removed)
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueNewCookieControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueNewCookieControl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueNewCookieControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueNewCookieControl.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,7 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlCodec;
-import org.apache.directory.shared.ldap.message.control.AbstractMutableControlImpl;
+import org.apache.directory.shared.ldap.message.control.InternalAbstractControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +40,7 @@
* @version $Rev: $
*
*/
-public class SyncInfoValueNewCookieControl extends AbstractMutableControlImpl implements SyncInfoValueControl
+public class SyncInfoValueNewCookieControl extends InternalAbstractControl implements SyncInfoValueControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = 1L;
Propchange: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueNewCookieControl.java
('svn:mergeinfo' removed)
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshDeleteControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshDeleteControl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshDeleteControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshDeleteControl.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,7 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlCodec;
-import org.apache.directory.shared.ldap.message.control.AbstractMutableControlImpl;
+import org.apache.directory.shared.ldap.message.control.InternalAbstractControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +44,7 @@
* @version $Rev: $
*
*/
-public class SyncInfoValueRefreshDeleteControl extends AbstractMutableControlImpl implements SyncInfoValueControl
+public class SyncInfoValueRefreshDeleteControl extends InternalAbstractControl implements SyncInfoValueControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = 1L;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshPresentControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshPresentControl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshPresentControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueRefreshPresentControl.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,7 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlCodec;
-import org.apache.directory.shared.ldap.message.control.AbstractMutableControlImpl;
+import org.apache.directory.shared.ldap.message.control.InternalAbstractControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,7 +44,7 @@
* @version $Rev: $
*
*/
-public class SyncInfoValueRefreshPresentControl extends AbstractMutableControlImpl implements SyncInfoValueControl
+public class SyncInfoValueRefreshPresentControl extends InternalAbstractControl implements SyncInfoValueControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = 1L;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueSyncIdSetControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueSyncIdSetControl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueSyncIdSetControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncInfoValueSyncIdSetControl.java Sat Apr 11 01:03:00 2009
@@ -24,7 +24,7 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.controls.replication.syncInfoValue.SyncInfoValueControlCodec;
-import org.apache.directory.shared.ldap.message.control.AbstractMutableControlImpl;
+import org.apache.directory.shared.ldap.message.control.InternalAbstractControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,7 +47,7 @@
* @version $Rev: $
*
*/
-public class SyncInfoValueSyncIdSetControl extends AbstractMutableControlImpl implements SyncInfoValueControl
+public class SyncInfoValueSyncIdSetControl extends InternalAbstractControl implements SyncInfoValueControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = 1L;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncRequestValueControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncRequestValueControl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncRequestValueControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncRequestValueControl.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,7 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.controls.replication.syncRequestValue.SyncRequestValueControlCodec;
-import org.apache.directory.shared.ldap.message.control.AbstractMutableControlImpl;
+import org.apache.directory.shared.ldap.message.control.InternalAbstractControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +46,7 @@
* @version $Rev: $
*
*/
-public class SyncRequestValueControl extends AbstractMutableControlImpl
+public class SyncRequestValueControl extends InternalAbstractControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = 1L;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateValueControl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateValueControl.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateValueControl.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/control/replication/SyncStateValueControl.java Sat Apr 11 01:03:00 2009
@@ -21,7 +21,7 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.codec.controls.replication.syncStateValue.SyncStateValueControlCodec;
-import org.apache.directory.shared.ldap.message.control.AbstractMutableControlImpl;
+import org.apache.directory.shared.ldap.message.control.InternalAbstractControl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,7 +47,7 @@
* @version $Rev: $
*
*/
-public class SyncStateValueControl extends AbstractMutableControlImpl
+public class SyncStateValueControl extends InternalAbstractControl
{
/** As this class is serializable, defined its serialVersionUID */
private static final long serialVersionUID = 1L;
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=764131&r1=764130&r2=764131&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 Sat Apr 11 01:03:00 2009
@@ -25,10 +25,10 @@
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.extended.operations.CertGenerationDecoder;
-import org.apache.directory.shared.ldap.codec.extended.operations.CertGenerationObject;
+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.message.ResultResponse;
+import org.apache.directory.shared.ldap.message.InternalResultResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,7 +43,10 @@
*/
public class CertGenerationRequest extends ExtendedRequestImpl
{
- private CertGenerationObject certGenObj;
+ /** The serial version UUID */
+ private static final long serialVersionUID = 1L;
+
+ private CertGenerationObject certGenObj;
private static final Logger LOG = LoggerFactory.getLogger( CertGenerationRequest.class );
@@ -141,7 +144,7 @@
}
- public ResultResponse getResultResponse()
+ public InternalResultResponse getResultResponse()
{
if ( response == null )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationResponse.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationResponse.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationResponse.java Sat Apr 11 01:03:00 2009
@@ -21,6 +21,7 @@
import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.util.StringTools;
/**
*
* The response sent back from the server after the CertGeneration extended operation is performed.
@@ -30,12 +31,12 @@
*/
public class CertGenerationResponse extends ExtendedResponseImpl
{
-
+ /** The serial version UUID */
+ private static final long serialVersionUID = 1L;
+
+ /** The CertGenerationResponse OID */
public static final String EXTENSION_OID = "1.3.6.1.4.1.18060.0.1.7";
- private static final byte[] EMPTY_RESPONSE = new byte[0];
-
-
public CertGenerationResponse(int messageId, ResultCodeEnum rcode)
{
super( messageId, EXTENSION_OID );
@@ -43,11 +44,7 @@
switch ( rcode )
{
case SUCCESS :
- break;
-
case OPERATIONS_ERROR :
- break;
-
case INSUFFICIENT_ACCESS_RIGHTS :
break;
@@ -80,12 +77,12 @@
*/
public byte[] getResponse()
{
- return EMPTY_RESPONSE;
+ return StringTools.EMPTY_BYTES;
}
/**
- * Sets the reponse OID specific encoded response values.
+ * Sets the response OID specific encoded response values.
*
* @param value
* the response specific encoded response values.
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java Sat Apr 11 01:03:00 2009
@@ -27,11 +27,11 @@
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.extended.operations.GracefulDisconnectContainer;
-import org.apache.directory.shared.ldap.codec.extended.operations.GracefulDisconnectDecoder;
+import org.apache.directory.shared.ldap.codec.extended.operations.gracefulDisconnect.GracefulDisconnectContainer;
+import org.apache.directory.shared.ldap.codec.extended.operations.gracefulDisconnect.GracefulDisconnectDecoder;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
-import org.apache.directory.shared.ldap.message.Referral;
+import org.apache.directory.shared.ldap.message.InternalReferral;
import org.apache.directory.shared.ldap.message.ReferralImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.util.LdapURL;
@@ -65,7 +65,7 @@
private int delay;
/** String based LDAP URL that may be followed for replicated namingContexts */
- private Referral replicatedContexts = new ReferralImpl();
+ private InternalReferral replicatedContexts = new ReferralImpl();
public GracefulDisconnect(byte[] value) throws DecoderException
@@ -104,11 +104,11 @@
private void decodeValue() throws DecoderException
{
GracefulDisconnectDecoder decoder = new GracefulDisconnectDecoder();
- org.apache.directory.shared.ldap.codec.extended.operations.GracefulDisconnect codec = null;
+ org.apache.directory.shared.ldap.codec.extended.operations.gracefulDisconnect.GracefulDisconnect codec = null;
try
{
- codec = ( org.apache.directory.shared.ldap.codec.extended.operations.GracefulDisconnect ) decoder
+ codec = ( org.apache.directory.shared.ldap.codec.extended.operations.gracefulDisconnect.GracefulDisconnect ) decoder
.decode( value );
this.timeOffline = codec.getTimeOffline();
this.delay = codec.getDelay();
@@ -130,7 +130,7 @@
private void encodeResponse()
{
- org.apache.directory.shared.ldap.codec.extended.operations.GracefulDisconnect codec = new org.apache.directory.shared.ldap.codec.extended.operations.GracefulDisconnect();
+ org.apache.directory.shared.ldap.codec.extended.operations.gracefulDisconnect.GracefulDisconnect codec = new org.apache.directory.shared.ldap.codec.extended.operations.gracefulDisconnect.GracefulDisconnect();
codec.setTimeOffline( this.timeOffline );
codec.setDelay( this.delay );
Iterator<String> contexts = this.replicatedContexts.getLdapUrls().iterator();
@@ -205,7 +205,7 @@
log.error( "Failed while decoding response", e );
}
- org.apache.directory.shared.ldap.codec.extended.operations.GracefulDisconnect codec = container
+ org.apache.directory.shared.ldap.codec.extended.operations.gracefulDisconnect.GracefulDisconnect codec = container
.getGracefulDisconnect();
this.delay = codec.getDelay();
this.timeOffline = codec.getTimeOffline();
@@ -280,7 +280,7 @@
}
- public Referral getReplicatedContexts()
+ public InternalReferral getReplicatedContexts()
{
return replicatedContexts;
}
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=764131&r1=764130&r2=764131&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 Sat Apr 11 01:03:00 2009
@@ -25,10 +25,10 @@
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.extended.operations.GracefulShutdown;
-import org.apache.directory.shared.ldap.codec.extended.operations.GracefulShutdownDecoder;
+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.message.ResultResponse;
+import org.apache.directory.shared.ldap.message.InternalResultResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -141,18 +141,11 @@
}
}
- if ( payload == null )
- {
- return null;
- }
-
- final byte[] copy = new byte[ payload.length ];
- System.arraycopy( payload, 0, copy, 0, payload.length );
- return copy;
+ return super.getPayload();
}
- public ResultResponse getResultResponse()
+ public InternalResultResponse getResultResponse()
{
if ( response == null )
{
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=764131&r1=764130&r2=764131&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 Sat Apr 11 01:03:00 2009
@@ -26,12 +26,12 @@
import org.apache.directory.shared.asn1.codec.EncoderException;
import org.apache.directory.shared.ldap.NotImplementedException;
-import org.apache.directory.shared.ldap.codec.extended.operations.StoredProcedure;
-import org.apache.directory.shared.ldap.codec.extended.operations.StoredProcedureContainer;
-import org.apache.directory.shared.ldap.codec.extended.operations.StoredProcedureDecoder;
-import org.apache.directory.shared.ldap.codec.extended.operations.StoredProcedure.StoredProcedureParameter;
+import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedure;
+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.message.ResultResponse;
+import org.apache.directory.shared.ldap.message.InternalResultResponse;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
@@ -130,7 +130,7 @@
}
- public ResultResponse getResultResponse()
+ public InternalResultResponse getResultResponse()
{
if ( response == null )
{
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ACIItemChekerTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ACIItemChekerTest.java?rev=764131&r1=764130&r2=764131&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ACIItemChekerTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/ACIItemChekerTest.java Sat Apr 11 01:03:00 2009
@@ -24,8 +24,8 @@
import java.text.ParseException;
import org.apache.directory.shared.ldap.aci.ACIItemChecker;
-
-import junit.framework.TestCase;
+import org.junit.Test;
+import static org.junit.Assert.fail;
/**
@@ -34,7 +34,7 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev: 437007 $
*/
-public class ACIItemChekerTest extends TestCase
+public class ACIItemChekerTest
{
/** the ACIItem checker wrapper */
@@ -59,7 +59,6 @@
*/
public ACIItemChekerTest(String s)
{
- super( s );
checker = new ACIItemChecker();
}
@@ -67,6 +66,7 @@
/**
* Tests the checker with an ACIItem of ItemFirst main component.
*/
+ @Test
public void testItemFirst() throws Exception
{
String spec = " { identificationTag \"id1\" , precedence 114 , authenticationLevel simple , "
@@ -85,6 +85,7 @@
/**
* Tests the checker with an ACIItem of UserFirst main component.
*/
+ @Test
public void testUserFirst() throws Exception
{
String spec = "{ identificationTag \"id2\" , precedence 14, authenticationLevel none , "
@@ -98,6 +99,7 @@
}
+ @Test
public void testAllowAddAllUsers() throws Exception
{
String spec = "{ identificationTag \"addAci\", " + "precedence 14, " + "authenticationLevel none, "
@@ -108,6 +110,7 @@
}
+ @Test
public void testCombo() throws Exception
{
String spec = "{ identificationTag \"addAci\", " + "precedence 14, " + "authenticationLevel none, "
@@ -118,6 +121,7 @@
}
+ @Test
public void testOrderOfProtectedItemsDoesNotMatter() throws Exception
{
String spec = " { identificationTag \"id1\" , precedence 114 , authenticationLevel simple , "
@@ -133,6 +137,7 @@
}
+ @Test
public void testOrderOfUserClassesDoesNotMatter() throws Exception
{
String spec = "{ identificationTag \"id2\" , precedence 14, authenticationLevel none , "
@@ -146,6 +151,7 @@
}
+ @Test
public void testItemPermissionComponentsOrderDoesNotMatter() throws Exception
{
String spec = " { identificationTag \"id1\" , precedence 114 , authenticationLevel simple , "
@@ -161,6 +167,7 @@
}
+ @Test
public void testUserPermissionComponentsOrderDoesNotMatter() throws Exception
{
String spec = "{ identificationTag \"id2\" , precedence 14, authenticationLevel none , "
@@ -174,6 +181,7 @@
}
+ @Test
public void testOrderOfMainACIComponentsDoesNotMatter() throws Exception
{
String spec = "{ itemOrUserFirst userFirst: { userClasses { allUsers , name { \"ou=people,cn=ersin\" }, "
@@ -187,6 +195,7 @@
}
+ @Test
public void testUserFirstComponentsOrderDoesNotMatter() throws Exception
{
String spec = "{ identificationTag \"id2\" , precedence 14, authenticationLevel none , "
@@ -199,6 +208,7 @@
}
+ @Test
public void testItemFirstComponentsOrderDoesNotMatter() throws Exception
{
String spec = " { identificationTag \"id1\" , precedence 114 , authenticationLevel simple , "
@@ -213,6 +223,7 @@
}
+ @Test
public void testRestrictedValueComponentsOrderDoesNotMatter() throws Exception
{
String spec = "{ identificationTag \"id2\" , precedence 14, authenticationLevel none , "
@@ -226,6 +237,7 @@
}
+ @Test
public void testMaxValueCountComponentsOrderDoesNotMatter() throws Exception
{
String spec = "{ identificationTag \"id2\" , precedence 14, authenticationLevel none , "
@@ -239,6 +251,7 @@
}
+ @Test
public void testSubtreeSpecificationComponentsOrderDoesNotMatter() throws Exception
{
String spec = "{ identificationTag \"id2\" , precedence 14, authenticationLevel none , "
@@ -254,6 +267,7 @@
/**
* Test case for DIRSERVER-891
*/
+ @Test
public void testInvalidAttributeValue()
{
String spec;
@@ -295,6 +309,7 @@
/**
* Test case for DIRSERVER-891
*/
+ @Test
public void testIncomplete()
{
String spec;
@@ -343,5 +358,4 @@
// Expected
}
}
-
}