You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/06 21:23:21 UTC
svn commit: r1056056 [2/4] - in /directory/shared/branches/alex_refactoring:
dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/
dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/
dsml-parser/src/main/java/org/apache...
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Thu Jan 6 20:23:17 2011
@@ -63,60 +63,39 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.actions.StoreTypeMatchingRuleAction;
import org.apache.directory.shared.ldap.codec.actions.ValueAction;
import org.apache.directory.shared.ldap.codec.controls.ControlFactory;
+import org.apache.directory.shared.ldap.codec.message.*;
import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter;
import org.apache.directory.shared.ldap.codec.search.SubstringFilter;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.AbandonRequest;
-import org.apache.directory.shared.ldap.message.AbandonRequestImpl;
import org.apache.directory.shared.ldap.message.AddRequest;
-import org.apache.directory.shared.ldap.message.AddRequestImpl;
import org.apache.directory.shared.ldap.message.AddResponse;
-import org.apache.directory.shared.ldap.message.AddResponseImpl;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.message.BindRequestImpl;
import org.apache.directory.shared.ldap.message.BindResponse;
-import org.apache.directory.shared.ldap.message.BindResponseImpl;
import org.apache.directory.shared.ldap.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.CompareRequestImpl;
import org.apache.directory.shared.ldap.message.CompareResponse;
-import org.apache.directory.shared.ldap.message.CompareResponseImpl;
import org.apache.directory.shared.ldap.message.DeleteRequest;
-import org.apache.directory.shared.ldap.message.DeleteRequestImpl;
import org.apache.directory.shared.ldap.message.DeleteResponse;
-import org.apache.directory.shared.ldap.message.DeleteResponseImpl;
import org.apache.directory.shared.ldap.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
import org.apache.directory.shared.ldap.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
import org.apache.directory.shared.ldap.message.IntermediateResponse;
-import org.apache.directory.shared.ldap.message.IntermediateResponseImpl;
import org.apache.directory.shared.ldap.message.LdapResult;
import org.apache.directory.shared.ldap.message.Message;
import org.apache.directory.shared.ldap.message.ModifyDnRequest;
-import org.apache.directory.shared.ldap.message.ModifyDnRequestImpl;
import org.apache.directory.shared.ldap.message.ModifyDnResponse;
-import org.apache.directory.shared.ldap.message.ModifyDnResponseImpl;
import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.ModifyResponse;
-import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
import org.apache.directory.shared.ldap.message.Referral;
-import org.apache.directory.shared.ldap.message.ReferralImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.ResultResponse;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
import org.apache.directory.shared.ldap.message.SearchResultDone;
-import org.apache.directory.shared.ldap.message.SearchResultDoneImpl;
import org.apache.directory.shared.ldap.message.SearchResultEntry;
-import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
import org.apache.directory.shared.ldap.message.SearchResultReference;
-import org.apache.directory.shared.ldap.message.SearchResultReferenceImpl;
import org.apache.directory.shared.ldap.message.UnbindRequest;
-import org.apache.directory.shared.ldap.message.UnbindRequestImpl;
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
@@ -148,6 +127,8 @@ public final class LdapMessageGrammar ex
/** The instance of grammar. LdapMessageGrammar is a singleton */
private static Grammar instance = new LdapMessageGrammar();
+ private static CodecMessageFactory messageFactory = new CodecMessageFactory();
+
// ~ Constructors
// -------------------------------------------------------------------------------
@@ -295,7 +276,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Create the UnbindRequest LdapMessage instance and store it in the container
- UnbindRequest unbindRequest = new UnbindRequestImpl( ldapMessageContainer.getMessageId() );
+ UnbindRequest unbindRequest = messageFactory.newUnbindRequest( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setMessage( unbindRequest );
TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -342,7 +323,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Create the DeleteRequest LdapMessage instance and store it in the container
- DeleteRequest delRequest = new DeleteRequestImpl( ldapMessageContainer.getMessageId() );
+ DeleteRequest delRequest = messageFactory.newDeleteRequest( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setMessage( delRequest );
// And store the DN into it
@@ -373,7 +354,7 @@ public final class LdapMessageGrammar ex
.getLocalizedMessage() );
LOG.error( msg );
- DeleteResponseImpl response = new DeleteResponseImpl( delRequest.getMessageId() );
+ DeleteResponse response = ( DeleteResponse ) messageFactory.newResponse( delRequest );
throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
DN.EMPTY_DN, ine );
}
@@ -418,7 +399,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Create the AbandonRequest LdapMessage instance and store it in the container
- AbandonRequest abandonRequest = new AbandonRequestImpl( ldapMessageContainer.getMessageId() );
+ AbandonRequest abandonRequest = messageFactory.newAbandonRequest( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setMessage( abandonRequest );
// The current TLV should be a integer
@@ -491,7 +472,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Create the BindRequest LdapMessage instance and store it in the container
- BindRequest bindRequest = new BindRequestImpl( ldapMessageContainer.getMessageId() );
+ BindRequest bindRequest = messageFactory.newBindRequest( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setMessage( bindRequest );
// We will check that the request is not null
@@ -595,7 +576,7 @@ public final class LdapMessageGrammar ex
+ ") is invalid";
LOG.error( "{} : {}", msg, ine.getMessage() );
- BindResponseImpl response = new BindResponseImpl( bindRequestMessage.getMessageId() );
+ BindResponse response = ( BindResponse ) messageFactory.newResponse( bindRequestMessage );
throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
DN.EMPTY_DN, ine );
@@ -696,7 +677,7 @@ public final class LdapMessageGrammar ex
String msg = I18n.err( I18n.ERR_04079 );
LOG.error( msg );
- BindResponseImpl response = new BindResponseImpl( bindRequestMessage.getMessageId() );
+ BindResponse response = ( BindResponse ) messageFactory.newResponse( bindRequestMessage );
throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_CREDENTIALS,
bindRequestMessage.getName(), null );
@@ -830,7 +811,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the BindResponse Object
- BindResponse bindResponse = new BindResponseImpl( ldapMessageContainer.getMessageId() );
+ BindResponse bindResponse = messageFactory.newBindResponse( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setMessage( bindResponse );
}
} );
@@ -1026,10 +1007,7 @@ public final class LdapMessageGrammar ex
Message response = ldapMessageContainer.getMessage();
LdapResult ldapResult = ( ( ResultResponse ) response ).getLdapResult();
-
- Referral referral = new ReferralImpl();
-
- ldapResult.setReferral( referral );
+ ldapResult.setReferral( messageFactory.newReferral() );
}
} );
@@ -1095,7 +1073,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the SearchResultEntry Object
- SearchResultEntry searchResultEntry = new SearchResultEntryImpl( ldapMessageContainer
+ SearchResultEntry searchResultEntry = messageFactory.newSearchResultEntry( ldapMessageContainer
.getMessageId() );
ldapMessageContainer.setMessage( searchResultEntry );
}
@@ -1373,7 +1351,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the SearchResultDone Object
- SearchResultDone searchResultDone = new SearchResultDoneImpl( ldapMessageContainer.getMessageId() );
+ SearchResultDone searchResultDone = messageFactory.newSearchResultDone( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setMessage( searchResultDone );
LOG.debug( "Search Result Done found" );
@@ -1411,7 +1389,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the ModifyRequest Object
- ModifyRequest modifyRequest = new ModifyRequestImpl( ldapMessageContainer.getMessageId() );
+ ModifyRequest modifyRequest = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setMessage( modifyRequest );
}
} );
@@ -1458,7 +1436,7 @@ public final class LdapMessageGrammar ex
+ ") is invalid";
LOG.error( "{} : {}", msg, ine.getMessage() );
- ModifyResponseImpl response = new ModifyResponseImpl( modifyRequest.getMessageId() );
+ org.apache.directory.shared.ldap.codec.message.ModifyResponseImpl response = new org.apache.directory.shared.ldap.codec.message.ModifyResponseImpl( modifyRequest.getMessageId() );
throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
DN.EMPTY_DN, ine );
}
@@ -1536,7 +1514,7 @@ public final class LdapMessageGrammar ex
}
// Store the current operation.
- ( ( ModifyRequestImpl ) modifyRequest ).setCurrentOperation( operation );
+ ( (org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl) modifyRequest ).setCurrentOperation( operation );
if ( IS_DEBUG )
{
@@ -1616,7 +1594,7 @@ public final class LdapMessageGrammar ex
else
{
type = StringTools.getType( tlv.getValue().getData() );
- ( ( ModifyRequestImpl ) modifyRequest ).addAttributeTypeAndValues( type );
+ ( (org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl) modifyRequest ).addAttributeTypeAndValues( type );
}
if ( IS_DEBUG )
@@ -1822,7 +1800,7 @@ public final class LdapMessageGrammar ex
// Now, we can allocate the AddRequest Object
int messageId = ldapMessageContainer.getMessageId();
- AddRequest addRequest = new AddRequestImpl( messageId );
+ AddRequest addRequest = new org.apache.directory.shared.ldap.codec.message.AddRequestImpl( messageId );
ldapMessageContainer.setMessage( addRequest );
// We will check that the request is not null
@@ -1865,7 +1843,7 @@ public final class LdapMessageGrammar ex
String msg = I18n.err( I18n.ERR_04085 );
LOG.error( msg );
- AddResponseImpl response = new AddResponseImpl( addRequest.getMessageId() );
+ org.apache.directory.shared.ldap.codec.message.AddResponseImpl response = new org.apache.directory.shared.ldap.codec.message.AddResponseImpl( addRequest.getMessageId() );
// I guess that trying to add an entry which DN is empty is a naming violation...
// Not 100% sure though ...
@@ -1888,7 +1866,7 @@ public final class LdapMessageGrammar ex
+ ") is invalid";
LOG.error( "{} : {}", msg, ine.getMessage() );
- AddResponseImpl response = new AddResponseImpl( addRequest.getMessageId() );
+ org.apache.directory.shared.ldap.codec.message.AddResponseImpl response = new org.apache.directory.shared.ldap.codec.message.AddResponseImpl( addRequest.getMessageId() );
throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
DN.EMPTY_DN, ine );
}
@@ -1950,7 +1928,7 @@ public final class LdapMessageGrammar ex
String msg = I18n.err( I18n.ERR_04086 );
LOG.error( msg );
- AddResponseImpl response = new AddResponseImpl( addRequest.getMessageId() );
+ org.apache.directory.shared.ldap.codec.message.AddResponseImpl response = new org.apache.directory.shared.ldap.codec.message.AddResponseImpl( addRequest.getMessageId() );
throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX,
addRequest.getEntry().getDn(), null );
@@ -1967,7 +1945,7 @@ public final class LdapMessageGrammar ex
String msg = I18n.err( I18n.ERR_04087 );
LOG.error( msg );
- AddResponseImpl response = new AddResponseImpl( addRequest.getMessageId() );
+ org.apache.directory.shared.ldap.codec.message.AddResponseImpl response = new org.apache.directory.shared.ldap.codec.message.AddResponseImpl( addRequest.getMessageId() );
throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX,
addRequest.getEntry().getDn(), ne );
}
@@ -2050,7 +2028,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the AddResponse Object
- AddResponse addResponse = new AddResponseImpl( ldapMessageContainer.getMessageId() );
+ AddResponse addResponse = new org.apache.directory.shared.ldap.codec.message.AddResponseImpl( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setMessage( addResponse );
// We will check that the request is not null
@@ -2137,7 +2115,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the ModifyDNRequest Object
- ModifyDnRequest modifyDnRequest = new ModifyDnRequestImpl( ldapMessageContainer
+ ModifyDnRequest modifyDnRequest = new org.apache.directory.shared.ldap.codec.message.ModifyDnRequestImpl( ldapMessageContainer
.getMessageId() );
ldapMessageContainer.setMessage( modifyDnRequest );
@@ -2190,7 +2168,7 @@ public final class LdapMessageGrammar ex
+ ") is invalid";
LOG.error( "{} : {}", msg, ine.getMessage() );
- ModifyDnResponseImpl response = new ModifyDnResponseImpl( modifyDNRequest.getMessageId() );
+ org.apache.directory.shared.ldap.codec.message.ModifyDnResponseImpl response = new org.apache.directory.shared.ldap.codec.message.ModifyDnResponseImpl( modifyDNRequest.getMessageId() );
throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
DN.EMPTY_DN, ine );
}
@@ -2238,7 +2216,7 @@ public final class LdapMessageGrammar ex
String msg = I18n.err( I18n.ERR_04090 );
LOG.error( msg );
- ModifyDnResponseImpl response = new ModifyDnResponseImpl( modifyDnRequest.getMessageId() );
+ org.apache.directory.shared.ldap.codec.message.ModifyDnResponseImpl response = new org.apache.directory.shared.ldap.codec.message.ModifyDnResponseImpl( modifyDnRequest.getMessageId() );
throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
modifyDnRequest.getName(), null );
}
@@ -2258,7 +2236,7 @@ public final class LdapMessageGrammar ex
+ ") is invalid";
LOG.error( "{} : {}", msg, ine.getMessage() );
- ModifyDnResponseImpl response = new ModifyDnResponseImpl( modifyDnRequest.getMessageId() );
+ org.apache.directory.shared.ldap.codec.message.ModifyDnResponseImpl response = new org.apache.directory.shared.ldap.codec.message.ModifyDnResponseImpl( modifyDnRequest.getMessageId() );
throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
modifyDnRequest.getName(), ine );
}
@@ -2385,7 +2363,7 @@ public final class LdapMessageGrammar ex
+ Strings.dumpBytes(dnBytes) + ") is invalid";
LOG.error( "{} : {}", msg, ine.getMessage() );
- ModifyDnResponseImpl response = new ModifyDnResponseImpl( modifyDnRequest.getMessageId() );
+ org.apache.directory.shared.ldap.codec.message.ModifyDnResponseImpl response = new org.apache.directory.shared.ldap.codec.message.ModifyDnResponseImpl( modifyDnRequest.getMessageId() );
throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
modifyDnRequest.getName(), ine );
}
@@ -2444,7 +2422,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the ModifyDnResponse Object
- ModifyDnResponse modifyDnResponse = new ModifyDnResponseImpl( ldapMessageContainer.getMessageId() );
+ ModifyDnResponse modifyDnResponse = new org.apache.directory.shared.ldap.codec.message.ModifyDnResponseImpl( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setMessage( modifyDnResponse );
LOG.debug( "Modify DN response " );
@@ -2486,7 +2464,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the CompareRequest Object
- CompareRequest compareRequest = new CompareRequestImpl( ldapMessageContainer.getMessageId() );
+ CompareRequest compareRequest = new org.apache.directory.shared.ldap.codec.message.CompareRequestImpl( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setMessage( compareRequest );
LOG.debug( "Compare Request" );
@@ -2537,7 +2515,7 @@ public final class LdapMessageGrammar ex
+ ") is invalid";
LOG.error( "{} : {}", msg, ine.getMessage() );
- CompareResponseImpl response = new CompareResponseImpl( compareRequest.getMessageId() );
+ CompareResponseImpl response = new org.apache.directory.shared.ldap.codec.message.CompareResponseImpl( compareRequest.getMessageId() );
throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_DN_SYNTAX,
DN.EMPTY_DN, ine );
}
@@ -2596,7 +2574,7 @@ public final class LdapMessageGrammar ex
{
String msg = I18n.err( I18n.ERR_04093 );
LOG.error( msg );
- CompareResponseImpl response = new CompareResponseImpl( compareRequest.getMessageId() );
+ org.apache.directory.shared.ldap.codec.message.CompareResponseImpl response = new CompareResponseImpl( compareRequest.getMessageId() );
throw new ResponseCarryingException( msg, response, ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX,
compareRequest.getName(), null );
@@ -2700,7 +2678,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the CompareResponse Object
- CompareResponse compareResponse = new CompareResponseImpl( ldapMessageContainer.getMessageId() );
+ CompareResponse compareResponse = new org.apache.directory.shared.ldap.codec.message.CompareResponseImpl( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setMessage( compareResponse );
// We will check that the request is not null
@@ -2972,7 +2950,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the ExtendedResponse Object
- ExtendedResponse extendedResponse = new ExtendedResponseImpl( ldapMessageContainer.getMessageId() );
+ ExtendedResponse extendedResponse = new org.apache.directory.shared.ldap.codec.message.ExtendedResponseImpl( ldapMessageContainer.getMessageId() );
ldapMessageContainer.setMessage( extendedResponse );
LOG.debug( "Extended Response" );
@@ -3182,7 +3160,7 @@ public final class LdapMessageGrammar ex
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
// Now, we can allocate the IntermediateResponse Object
- IntermediateResponse intermediateResponse = new IntermediateResponseImpl( ldapMessageContainer
+ IntermediateResponse intermediateResponse = new org.apache.directory.shared.ldap.codec.message.IntermediateResponseImpl( ldapMessageContainer
.getMessageId() );
ldapMessageContainer.setMessage( intermediateResponse );
@@ -3590,7 +3568,7 @@ public final class LdapMessageGrammar ex
TLV tlv = ldapMessageContainer.getCurrentTLV();
SearchRequest searchRequest = new SearchRequestImpl( ldapMessageContainer.getMessageId() );
- ( ( SearchRequestImpl ) searchRequest ).setTlvId( tlv.getId() );
+ ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).setTlvId( tlv.getId() );
ldapMessageContainer.setMessage( searchRequest );
LOG.debug( "Search Request" );
@@ -5055,7 +5033,7 @@ public final class LdapMessageGrammar ex
// We now have to get back to the nearest filter which
// is not terminal.
- ( ( SearchRequestImpl ) searchRequest ).setTerminalFilter( substringFilter );
+ ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).setTerminalFilter( substringFilter );
}
}
} );
@@ -5128,7 +5106,7 @@ public final class LdapMessageGrammar ex
// We now have to get back to the nearest filter which is
// not terminal.
- ( ( SearchRequestImpl ) searchRequest ).unstackFilters( container );
+ ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).unstackFilters( container );
}
} );
@@ -6163,7 +6141,7 @@ public final class LdapMessageGrammar ex
TLV tlv = ldapMessageContainer.getCurrentTLV();
// Store the value.
- ExtensibleMatchFilter extensibleMatchFilter = ( ExtensibleMatchFilter ) ( ( SearchRequestImpl ) searchRequest )
+ ExtensibleMatchFilter extensibleMatchFilter = ( ExtensibleMatchFilter ) ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest )
.getTerminalFilter();
// We get the value. If it's a 0, it's a FALSE. If it's
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java Thu Jan 6 20:23:17 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.search.AndFilter;
import org.apache.directory.shared.ldap.codec.search.Filter;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java Thu Jan 6 20:23:17 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
import org.apache.directory.shared.ldap.codec.search.Filter;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -72,7 +72,7 @@ public class InitApproxMatchFilterAction
// Store the filter structure that still has to be
// fulfilled
- ( ( SearchRequestImpl ) searchRequest ).setTerminalFilter( filter );
+ ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).setTerminalFilter( filter );
if ( IS_DEBUG )
{
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java Thu Jan 6 20:23:17 2011
@@ -31,7 +31,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.StringValue;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
import org.apache.directory.shared.util.CharConstants;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
@@ -83,7 +82,7 @@ public class InitAssertionValueFilterAct
assertionValue = new BinaryValue( CharConstants.EMPTY_BYTES );
}
- AttributeValueAssertionFilter terminalFilter = ( AttributeValueAssertionFilter ) ( ( SearchRequestImpl ) searchRequest )
+ AttributeValueAssertionFilter terminalFilter = ( AttributeValueAssertionFilter ) ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest )
.getTerminalFilter();
AttributeValueAssertion assertion = terminalFilter.getAssertion();
@@ -116,7 +115,7 @@ public class InitAssertionValueFilterAct
// We now have to get back to the nearest filter which is
// not terminal.
- ( ( SearchRequestImpl ) searchRequest ).unstackFilters( container );
+ ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).unstackFilters( container );
if ( IS_DEBUG )
{
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java Thu Jan 6 20:23:17 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java Thu Jan 6 20:23:17 2011
@@ -28,7 +28,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
import org.apache.directory.shared.ldap.codec.search.Filter;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,11 +67,11 @@ public class InitEqualityMatchFilterActi
Filter filter = new AttributeValueAssertionFilter( ldapMessageContainer.getTlvId(),
LdapConstants.EQUALITY_MATCH_FILTER );
- ( ( SearchRequestImpl ) searchRequest ).addCurrentFilter( filter );
+ ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).addCurrentFilter( filter );
// Store the filter structure that still has to be
// fulfilled
- ( ( SearchRequestImpl ) searchRequest ).setTerminalFilter( filter );
+ ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).setTerminalFilter( filter );
if ( IS_DEBUG )
{
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java Thu Jan 6 20:23:17 2011
@@ -27,7 +27,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter;
import org.apache.directory.shared.ldap.codec.search.Filter;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,8 +65,8 @@ public class InitExtensibleMatchFilterAc
// We can allocate the ExtensibleMatch Filter
Filter extensibleMatchFilter = new ExtensibleMatchFilter( ldapMessageContainer.getTlvId() );
- ( ( SearchRequestImpl ) searchRequest ).addCurrentFilter( extensibleMatchFilter );
- ( ( SearchRequestImpl ) searchRequest ).setTerminalFilter( extensibleMatchFilter );
+ ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).addCurrentFilter( extensibleMatchFilter );
+ ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).setTerminalFilter( extensibleMatchFilter );
if ( IS_DEBUG )
{
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java Thu Jan 6 20:23:17 2011
@@ -28,7 +28,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
import org.apache.directory.shared.ldap.codec.search.Filter;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,11 +67,11 @@ public class InitGreaterOrEqualFilterAct
Filter filter = new AttributeValueAssertionFilter( ldapMessageContainer.getTlvId(),
LdapConstants.GREATER_OR_EQUAL_FILTER );
- ( ( SearchRequestImpl ) searchRequest ).addCurrentFilter( filter );
+ ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).addCurrentFilter( filter );
// Store the filter structure that still has to be
// fullfiled
- ( ( SearchRequestImpl ) searchRequest ).setTerminalFilter( filter );
+ ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).setTerminalFilter( filter );
if ( IS_DEBUG )
{
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java Thu Jan 6 20:23:17 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
import org.apache.directory.shared.ldap.codec.search.Filter;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -72,7 +72,7 @@ public class InitLessOrEqualFilterAction
// Store the filter structure that still has to be
// fullfiled
- ( ( SearchRequestImpl ) searchRequest ).setTerminalFilter( filter );
+ ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).setTerminalFilter( filter );
if ( IS_DEBUG )
{
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java Thu Jan 6 20:23:17 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.search.Filter;
import org.apache.directory.shared.ldap.codec.search.NotFilter;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java Thu Jan 6 20:23:17 2011
@@ -29,7 +29,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.search.Filter;
import org.apache.directory.shared.ldap.codec.search.OrFilter;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,7 +78,7 @@ public class InitOrFilterAction extends
Filter orFilter = new OrFilter( ldapMessageContainer.getTlvId() );
// Set the filter
- ( ( SearchRequestImpl ) searchRequest ).addCurrentFilter( orFilter );
+ ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).addCurrentFilter( orFilter );
if ( IS_DEBUG )
{
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java Thu Jan 6 20:23:17 2011
@@ -27,7 +27,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.codec.search.PresentFilter;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.java Thu Jan 6 20:23:17 2011
@@ -28,7 +28,6 @@ import org.apache.directory.shared.i18n.
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.message.LdapResult;
import org.apache.directory.shared.ldap.message.Referral;
-import org.apache.directory.shared.ldap.message.ReferralImpl;
import org.apache.directory.shared.ldap.message.ResultResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,7 +78,7 @@ public class InitReferralsAction extends
ResultResponse response = ( ResultResponse ) ldapMessageContainer.getMessage();
LdapResult ldapResult = response.getLdapResult();
- Referral referral = new ReferralImpl();
+ Referral referral = new org.apache.directory.shared.ldap.codec.message.ReferralImpl();
ldapResult.setReferral( referral );
if ( IS_DEBUG )
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java Thu Jan 6 20:23:17 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.search.Filter;
import org.apache.directory.shared.ldap.codec.search.SubstringFilter;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java Thu Jan 6 20:23:17 2011
@@ -25,7 +25,7 @@ import org.apache.directory.shared.asn1.
import org.apache.directory.shared.asn1.ber.tlv.TLV;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl;
import org.apache.directory.shared.util.CharConstants;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.java Thu Jan 6 20:23:17 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.i18n.
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.codec.search.SubstringFilter;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,7 +68,7 @@ public class StoreAnyAction extends Gram
TLV tlv = ldapMessageContainer.getCurrentTLV();
// Store the value.
- SubstringFilter substringFilter = ( SubstringFilter ) ( ( SearchRequestImpl ) searchRequest )
+ SubstringFilter substringFilter = ( SubstringFilter ) ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest )
.getTerminalFilter();
if ( tlv.getLength() == 0 )
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreFinalAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreFinalAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreFinalAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreFinalAction.java Thu Jan 6 20:23:17 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.i18n.
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.codec.search.SubstringFilter;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -83,7 +83,7 @@ public class StoreFinalAction extends Gr
// We now have to get back to the nearest filter which is
// not terminal.
- ( ( SearchRequestImpl ) searchRequest ).unstackFilters( container );
+ ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).unstackFilters( container );
if ( IS_DEBUG )
{
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreMatchValueAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreMatchValueAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreMatchValueAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreMatchValueAction.java Thu Jan 6 20:23:17 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter;
import org.apache.directory.shared.ldap.entry.BinaryValue;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,7 +67,7 @@ public class StoreMatchValueAction exten
TLV tlv = ldapMessageContainer.getCurrentTLV();
// Store the value.
- ExtensibleMatchFilter extensibleMatchFilter = ( ExtensibleMatchFilter ) ( ( SearchRequestImpl ) searchRequest )
+ ExtensibleMatchFilter extensibleMatchFilter = ( ExtensibleMatchFilter ) ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest )
.getTerminalFilter();
byte[] value = tlv.getValue().getData();
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.java Thu Jan 6 20:23:17 2011
@@ -28,7 +28,6 @@ import org.apache.directory.shared.i18n.
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.message.Referral;
-import org.apache.directory.shared.ldap.message.ReferralImpl;
import org.apache.directory.shared.ldap.message.SearchResultReference;
import org.apache.directory.shared.ldap.util.LdapURL;
import org.apache.directory.shared.util.Strings;
@@ -77,7 +76,7 @@ public class StoreReferenceAction extend
if ( referral == null )
{
- referral = new ReferralImpl();
+ referral = new org.apache.directory.shared.ldap.codec.message.ReferralImpl();
searchResultReference.setReferral( referral );
}
Modified: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.java?rev=1056056&r1=1056055&r2=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.java Thu Jan 6 20:23:17 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.i18n.
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl;
import org.apache.directory.shared.util.Strings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AbandonRequestImpl.java (from r1054491, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AbandonRequestImpl.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AbandonRequestImpl.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java&r1=1054491&r2=1056056&rev=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AbandonRequestImpl.java Thu Jan 6 20:23:17 2011
@@ -17,10 +17,12 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.codec.message;
import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.message.AbandonRequest;
+import org.apache.directory.shared.ldap.message.AbstractRequest;
/**
@@ -28,7 +30,7 @@ import org.apache.directory.shared.i18n.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class AbandonRequestImpl extends AbstractRequest implements AbandonRequest
+class AbandonRequestImpl extends AbstractRequest implements AbandonRequest
{
static final long serialVersionUID = -4688193359792740969L;
Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AbandonRequestImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AddRequestImpl.java (from r1054491, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AddRequestImpl.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AddRequestImpl.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java&r1=1054491&r2=1056056&rev=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AddRequestImpl.java Thu Jan 6 20:23:17 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.codec.message;
import java.util.List;
@@ -27,6 +27,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.exception.LdapException;
+import org.apache.directory.shared.ldap.message.*;
import org.apache.directory.shared.ldap.name.DN;
@@ -35,7 +36,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class AddRequestImpl extends AbstractAbandonableRequest implements AddRequest
+class AddRequestImpl extends AbstractAbandonableRequest implements AddRequest
{
static final long serialVersionUID = 7534132448349520346L;
Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AddRequestImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AddResponseImpl.java (from r1054491, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AddResponseImpl.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AddResponseImpl.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java&r1=1054491&r2=1056056&rev=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AddResponseImpl.java Thu Jan 6 20:23:17 2011
@@ -17,15 +17,18 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.codec.message;
+import org.apache.directory.shared.ldap.message.AbstractResultResponse;
+import org.apache.directory.shared.ldap.message.AddResponse;
+
/**
* AddResponse implementation.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class AddResponseImpl extends AbstractResultResponse implements AddResponse
+class AddResponseImpl extends AbstractResultResponse implements AddResponse
{
/** The encoded addResponse length */
private int addResponseLength;
Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/AddResponseImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/BindRequestImpl.java (from r1054491, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/BindRequestImpl.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/BindRequestImpl.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java&r1=1054491&r2=1056056&rev=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/BindRequestImpl.java Thu Jan 6 20:23:17 2011
@@ -17,12 +17,13 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.codec.message;
import java.util.Arrays;
import org.apache.directory.shared.i18n.I18n;
+import org.apache.directory.shared.ldap.message.*;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.util.Strings;
@@ -33,7 +34,7 @@ import org.apache.directory.shared.util.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public class BindRequestImpl extends AbstractAbandonableRequest implements BindRequest
+class BindRequestImpl extends AbstractAbandonableRequest implements BindRequest
{
static final long serialVersionUID = 7945504184130380071L;
Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/BindRequestImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/BindResponseImpl.java (from r1054491, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/BindResponseImpl.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/BindResponseImpl.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java&r1=1054491&r2=1056056&rev=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/BindResponseImpl.java Thu Jan 6 20:23:17 2011
@@ -17,11 +17,13 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.codec.message;
import java.util.Arrays;
+import org.apache.directory.shared.ldap.message.AbstractResultResponse;
+import org.apache.directory.shared.ldap.message.BindResponse;
import org.apache.directory.shared.util.Strings;
@@ -30,7 +32,7 @@ import org.apache.directory.shared.util.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public class BindResponseImpl extends AbstractResultResponse implements BindResponse
+class BindResponseImpl extends AbstractResultResponse implements BindResponse
{
static final long serialVersionUID = -5146809476518669755L;
Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/BindResponseImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/CodecMessageFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/CodecMessageFactory.java?rev=1056056&view=auto
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/CodecMessageFactory.java (added)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/CodecMessageFactory.java Thu Jan 6 20:23:17 2011
@@ -0,0 +1,157 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.shared.ldap.codec.message;
+
+
+import org.apache.directory.shared.ldap.message.*;
+
+
+/**
+ * A MessageFactory implemented by the Codec to hide implementation details.
+ *
+ * @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
+ * $Rev: 946353 $
+ */
+public class CodecMessageFactory implements MessageFactory
+{
+ public Response newResponse( SingleReplyRequest request )
+ {
+ Response response = null;
+
+ switch ( request.getResponseType() )
+ {
+ case ADD_REQUEST:
+ response = new AddResponseImpl( request.getMessageId() );
+ break;
+ case BIND_REQUEST:
+ response = new BindResponseImpl( request.getMessageId() );
+ break;
+ case COMPARE_REQUEST:
+ response = new CompareResponseImpl( request.getMessageId() );
+ break;
+ case DEL_REQUEST:
+ response = new DeleteResponseImpl( request.getMessageId() );
+ break;
+ case EXTENDED_REQUEST:
+ response = new ExtendedResponseImpl( request.getMessageId() );
+ break;
+ case MODIFYDN_RESPONSE:
+ response = new ModifyDnResponseImpl( request.getMessageId() );
+ break;
+ case MODIFY_REQUEST:
+ response = new ModifyResponseImpl( request.getMessageId() );
+ break;
+ default:
+ throw new IllegalArgumentException( "Not a SingleReplyRequest instance: " + request.getResponseType() );
+ }
+
+ return response;
+ }
+
+
+ public AbandonRequest newAbandonRequest( int id )
+ {
+ return new AbandonRequestImpl( id );
+ }
+
+
+ public AddRequest newAddRequest( int id )
+ {
+ return new AddRequestImpl( id );
+ }
+
+
+ public BindRequest newBindRequest( int id )
+ {
+ return new BindRequestImpl( id );
+ }
+
+
+ public BindResponse newBindResponse( int id )
+ {
+ return new BindResponseImpl( id );
+ }
+
+
+ public CompareRequest newCompareRequest( int id )
+ {
+ return new CompareRequestImpl( id );
+ }
+
+
+ public DeleteRequest newDeleteRequest( int id )
+ {
+ return new DeleteRequestImpl( id );
+ }
+
+
+ public ExtendedRequest newExtendedRequest( int id )
+ {
+ return new ExtendedRequestImpl( id );
+ }
+
+
+ public ModifyDnRequest newModifyDnRequest( int id )
+ {
+ return new ModifyDnRequestImpl( id );
+ }
+
+
+ public ModifyRequest newModifyRequest( int id )
+ {
+ return new ModifyRequestImpl( id );
+ }
+
+
+ public SearchRequest newSearchRequest( int id )
+ {
+ return new SearchRequestImpl( id );
+ }
+
+
+ public UnbindRequest newUnbindRequest( int id )
+ {
+ return new UnbindRequestImpl( id );
+ }
+
+
+ public SearchResultDone newSearchResultDone( int id )
+ {
+ return new SearchResultDoneImpl( id );
+ }
+
+
+ public SearchResultEntry newSearchResultEntry( int id )
+ {
+ return new SearchResultEntryImpl( id );
+ }
+
+
+ public SearchResultReference newSearchResultReference( int id )
+ {
+ return new SearchResultReferenceImpl( id );
+ }
+
+
+ public Referral newReferral()
+ {
+ return new ReferralImpl();
+ }
+}
Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/CompareRequestImpl.java (from r1054491, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/CompareRequestImpl.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/CompareRequestImpl.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java&r1=1054491&r2=1056056&rev=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/CompareRequestImpl.java Thu Jan 6 20:23:17 2011
@@ -17,12 +17,13 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.codec.message;
import org.apache.directory.shared.ldap.entry.BinaryValue;
import org.apache.directory.shared.ldap.entry.StringValue;
import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.message.*;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.util.Strings;
@@ -32,7 +33,7 @@ import org.apache.directory.shared.util.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CompareRequestImpl extends AbstractAbandonableRequest implements CompareRequest
+class CompareRequestImpl extends AbstractAbandonableRequest implements CompareRequest
{
static final long serialVersionUID = 1699731530016468977L;
Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/CompareRequestImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/CompareResponseImpl.java (from r1054491, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/CompareResponseImpl.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/CompareResponseImpl.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java&r1=1054491&r2=1056056&rev=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/CompareResponseImpl.java Thu Jan 6 20:23:17 2011
@@ -17,15 +17,19 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.codec.message;
+import org.apache.directory.shared.ldap.message.AbstractResultResponse;
+import org.apache.directory.shared.ldap.message.CompareResponse;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+
/**
* CompareResponse implementation.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public class CompareResponseImpl extends AbstractResultResponse implements CompareResponse
+class CompareResponseImpl extends AbstractResultResponse implements CompareResponse
{
/** The encoded compareResponse length */
private int compareResponseLength;
Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/CompareResponseImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/DeleteRequestImpl.java (from r1054491, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/DeleteRequestImpl.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/DeleteRequestImpl.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java&r1=1054491&r2=1056056&rev=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/DeleteRequestImpl.java Thu Jan 6 20:23:17 2011
@@ -17,9 +17,10 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.codec.message;
+import org.apache.directory.shared.ldap.message.*;
import org.apache.directory.shared.ldap.name.DN;
@@ -28,7 +29,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class DeleteRequestImpl extends AbstractAbandonableRequest implements DeleteRequest
+class DeleteRequestImpl extends AbstractAbandonableRequest implements DeleteRequest
{
static final long serialVersionUID = 3187847454305567542L;
Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/DeleteRequestImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/DeleteResponseImpl.java (from r1054491, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/DeleteResponseImpl.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/DeleteResponseImpl.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java&r1=1054491&r2=1056056&rev=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/DeleteResponseImpl.java Thu Jan 6 20:23:17 2011
@@ -17,15 +17,18 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.codec.message;
+import org.apache.directory.shared.ldap.message.AbstractResultResponse;
+import org.apache.directory.shared.ldap.message.DeleteResponse;
+
/**
* DeleteResponse implementation
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public class DeleteResponseImpl extends AbstractResultResponse implements DeleteResponse
+class DeleteResponseImpl extends AbstractResultResponse implements DeleteResponse
{
/** The encoded deleteResponse length */
private int deleteResponseLength;
Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/DeleteResponseImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/ExtendedRequestImpl.java (from r1054491, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/ExtendedRequestImpl.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/ExtendedRequestImpl.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java&r1=1054491&r2=1056056&rev=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/ExtendedRequestImpl.java Thu Jan 6 20:23:17 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.codec.message;
import java.util.Arrays;
@@ -25,6 +25,10 @@ import java.util.Arrays;
import javax.naming.NamingException;
import javax.naming.ldap.ExtendedResponse;
+import org.apache.directory.shared.ldap.message.AbstractRequest;
+import org.apache.directory.shared.ldap.message.ExtendedRequest;
+import org.apache.directory.shared.ldap.message.MessageTypeEnum;
+import org.apache.directory.shared.ldap.message.ResultResponse;
import org.apache.directory.shared.util.Strings;
@@ -33,7 +37,7 @@ import org.apache.directory.shared.util.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ExtendedRequestImpl extends AbstractRequest implements ExtendedRequest
+class ExtendedRequestImpl extends AbstractRequest implements ExtendedRequest
{
static final long serialVersionUID = 7916990159044177480L;
Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/ExtendedRequestImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/ExtendedResponseImpl.java (from r1054491, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/ExtendedResponseImpl.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/ExtendedResponseImpl.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java&r1=1054491&r2=1056056&rev=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/ExtendedResponseImpl.java Thu Jan 6 20:23:17 2011
@@ -17,11 +17,13 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.codec.message;
import java.util.Arrays;
+import org.apache.directory.shared.ldap.message.AbstractResultResponse;
+import org.apache.directory.shared.ldap.message.ExtendedResponse;
import org.apache.directory.shared.util.Strings;
@@ -30,7 +32,7 @@ import org.apache.directory.shared.util.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public class ExtendedResponseImpl extends AbstractResultResponse implements ExtendedResponse
+class ExtendedResponseImpl extends AbstractResultResponse implements ExtendedResponse
{
static final long serialVersionUID = -6646752766410531060L;
Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/ExtendedResponseImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/IntermediateResponseImpl.java (from r1054491, directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/IntermediateResponseImpl.java?p2=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/IntermediateResponseImpl.java&p1=directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java&r1=1054491&r2=1056056&rev=1056056&view=diff
==============================================================================
--- directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java (original)
+++ directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/IntermediateResponseImpl.java Thu Jan 6 20:23:17 2011
@@ -17,11 +17,13 @@
* under the License.
*
*/
-package org.apache.directory.shared.ldap.message;
+package org.apache.directory.shared.ldap.codec.message;
import java.util.Arrays;
+import org.apache.directory.shared.ldap.message.AbstractResultResponse;
+import org.apache.directory.shared.ldap.message.IntermediateResponse;
import org.apache.directory.shared.util.Strings;
@@ -30,7 +32,7 @@ import org.apache.directory.shared.util.
*
* @author <a href="mailto:dev@directory.apache.org"> Apache Directory Project</a>
*/
-public class IntermediateResponseImpl extends AbstractResultResponse implements IntermediateResponse
+class IntermediateResponseImpl extends AbstractResultResponse implements IntermediateResponse
{
static final long serialVersionUID = -6646752766410531060L;
Propchange: directory/shared/branches/alex_refactoring/ldap/src/main/java/org/apache/directory/shared/ldap/codec/message/IntermediateResponseImpl.java
------------------------------------------------------------------------------
svn:eol-style = native