Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchDnAttributesRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchDnAttributesRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchDnAttributesRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchDnAttributesRule.java Sat Feb 12 12:28:39 2005 @@ -17,9 +17,8 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.digester.rules.PrimitiveBooleanRule; import org.apache.asn1.ber.digester.rules.PrimitiveBooleanRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; /**
Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchMatchingRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchMatchingRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchMatchingRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchMatchingRule.java Sat Feb 12 12:28:39 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchRule.java Sat Feb 12 12:28:39 2005 @@ -17,15 +17,12 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.AbstractRule; - +import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.filter.ExtensibleNode; -import org.apache.asn1.ber.digester.AbstractRule; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchTypeRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchTypeRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchTypeRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchTypeRule.java Sat Feb 12 12:28:39 2005 @@ -17,13 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.decoder.search.ExtensibleMatchRule; -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchValueRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchValueRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchValueRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ExtensibleMatchValueRule.java Sat Feb 12 12:28:39 2005 @@ -17,13 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.decoder.search.ExtensibleMatchRule; -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/GreaterOrEqualRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/GreaterOrEqualRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/GreaterOrEqualRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/GreaterOrEqualRule.java Sat Feb 12 12:28:39 2005 @@ -17,13 +17,11 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; -import org.apache.asn1.ber.TypeClass; - import org.apache.ldap.common.filter.SimpleNode; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/LessOrEqualRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/LessOrEqualRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/LessOrEqualRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/LessOrEqualRule.java Sat Feb 12 12:28:39 2005 @@ -17,14 +17,11 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; - import org.apache.ldap.common.filter.SimpleNode; -import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; -import org.apache.asn1.ber.TypeClass; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/NotRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/NotRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/NotRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/NotRule.java Sat Feb 12 12:28:39 2005 @@ -17,15 +17,13 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TypeClass; -import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.filter.BranchNode; -import org.apache.asn1.ber.digester.AbstractRule; import org.apache.asn1.ber.digester.AbstractRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.filter.BranchNode; +import org.apache.ldap.common.filter.ExprNode; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/OrRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/OrRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/OrRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/OrRule.java Sat Feb 12 12:28:39 2005 @@ -17,16 +17,13 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TypeClass; -import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.filter.BranchNode; -import org.apache.asn1.ber.digester.AbstractRule; import org.apache.asn1.ber.digester.AbstractRule; -import org.apache.asn1.ber.TypeClass; +import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.filter.BranchNode; +import org.apache.ldap.common.filter.ExprNode; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/PresentRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/PresentRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/PresentRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/PresentRule.java Sat Feb 12 12:28:39 2005 @@ -17,15 +17,12 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; - +import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.filter.PresenceNode; -import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/RequestedAttributesRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/RequestedAttributesRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/RequestedAttributesRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/RequestedAttributesRule.java Sat Feb 12 12:28:39 2005 @@ -17,12 +17,11 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.ldap.common.message.SearchRequestImpl; -import org.apache.asn1.ber.primitives.UniversalTag; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/RequestedAttributesStateChangeRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/RequestedAttributesStateChangeRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/RequestedAttributesStateChangeRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/RequestedAttributesStateChangeRule.java Sat Feb 12 12:28:39 2005 @@ -18,7 +18,6 @@ import org.apache.asn1.ber.TypeClass; -import org.apache.ldap.common.berlib.asn1.decoder.search.BaseSearchRequestRule; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ScopeRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ScopeRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ScopeRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/ScopeRule.java Sat Feb 12 12:28:39 2005 @@ -17,15 +17,12 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - import org.apache.asn1.ber.TypeClass; -import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.asn1.ber.primitives.PrimitiveUtils; - +import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.ldap.common.message.ScopeEnum; -import org.apache.ldap.common.berlib.asn1.decoder.search.BaseSearchRequestRule; -import org.apache.asn1.ber.primitives.PrimitiveUtils; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRequestRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRequestRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRequestRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchRequestRule.java Sat Feb 12 12:28:39 2005 @@ -19,9 +19,6 @@ import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.AbstractRule; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.decoder.search.SearchRequestProcessing; import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.message.SearchRequestImpl; Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseDoneRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseDoneRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseDoneRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseDoneRule.java Sat Feb 12 12:28:39 2005 @@ -19,7 +19,6 @@ import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.decoder.ResultResponseRule; -import org.apache.ldap.common.berlib.asn1.LdapTag; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryAttributesRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryAttributesRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryAttributesRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryAttributesRule.java Sat Feb 12 12:28:39 2005 @@ -17,15 +17,12 @@ package org.apache.ldap.common.berlib.asn1.decoder.search ; -import org.apache.asn1.ber.TagEnum ; +import org.apache.asn1.ber.TagEnum; import org.apache.asn1.ber.TypeClass; -import org.apache.asn1.ber.TypeClass ; -import org.apache.asn1.ber.digester.AbstractRule ; -import org.apache.asn1.ber.primitives.UniversalTag ; - -import org.apache.ldap.common.message.LockableAttributesImpl ; -import org.apache.ldap.common.message.SearchResponseEntryImpl ; +import org.apache.asn1.ber.digester.AbstractRule; import org.apache.asn1.ber.primitives.UniversalTag; +import org.apache.ldap.common.message.LockableAttributesImpl; +import org.apache.ldap.common.message.SearchResponseEntryImpl; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryDnRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryDnRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryDnRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryDnRule.java Sat Feb 12 12:28:39 2005 @@ -17,13 +17,11 @@ package org.apache.ldap.common.berlib.asn1.decoder.search ; -import java.nio.ByteBuffer ; - -import org.apache.ldap.common.message.SearchResponseEntry ; - -import org.apache.asn1.ber.primitives.UniversalTag ; -import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule ; +import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; import org.apache.asn1.ber.primitives.UniversalTag; +import org.apache.ldap.common.message.SearchResponseEntry; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseEntryRule.java Sat Feb 12 12:28:39 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search ; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.AbstractRule; - -import org.apache.ldap.common.message.SearchResponseEntryImpl ; +import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.message.SearchResponseEntryImpl; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseReferenceRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseReferenceRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseReferenceRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseReferenceRule.java Sat Feb 12 12:28:39 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search ; +import org.apache.asn1.ber.TypeClass; +import org.apache.asn1.ber.digester.AbstractRule; import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.TypeClass ; -import org.apache.asn1.ber.digester.AbstractRule ; - -import org.apache.ldap.common.message.SearchResponseReferenceImpl ; +import org.apache.ldap.common.message.SearchResponseReferenceImpl; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseReferralRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseReferralRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseReferralRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SearchResponseReferralRule.java Sat Feb 12 12:28:39 2005 @@ -17,15 +17,12 @@ package org.apache.ldap.common.berlib.asn1.decoder.search ; -import org.apache.ldap.common.message.ReferralImpl ; -import org.apache.ldap.common.message.SearchResponseReferenceImpl ; - -import org.apache.asn1.ber.TagEnum ; -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.TypeClass ; -import org.apache.asn1.ber.digester.AbstractRule ; +import org.apache.asn1.ber.TagEnum; +import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.AbstractRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.message.ReferralImpl; +import org.apache.ldap.common.message.SearchResponseReferenceImpl; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SizeLimitRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SizeLimitRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SizeLimitRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SizeLimitRule.java Sat Feb 12 12:28:39 2005 @@ -17,14 +17,11 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - import org.apache.asn1.ber.TypeClass; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.primitives.PrimitiveUtils; import org.apache.asn1.ber.primitives.PrimitiveUtils; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.ldap.common.berlib.asn1.decoder.search.BaseSearchRequestRule; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchAnyRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchAnyRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchAnyRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchAnyRule.java Sat Feb 12 12:28:39 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchFinalRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchFinalRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchFinalRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchFinalRule.java Sat Feb 12 12:28:39 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchInitialRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchInitialRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchInitialRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchInitialRule.java Sat Feb 12 12:28:39 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.digester.rules.PrimitiveOctetStringRule; +import org.apache.ldap.common.berlib.asn1.LdapTag; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/SubstringMatchRule.java Sat Feb 12 12:28:39 2005 @@ -17,15 +17,13 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.util.ArrayList; -import java.nio.ByteBuffer; - -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.AbstractRule; - +import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.filter.SubstringNode; -import org.apache.asn1.ber.digester.AbstractRule; + +import java.nio.ByteBuffer; +import java.util.ArrayList; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/TerminateFilterStateRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/TerminateFilterStateRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/TerminateFilterStateRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/TerminateFilterStateRule.java Sat Feb 12 12:28:39 2005 @@ -19,7 +19,6 @@ import org.apache.asn1.ber.TypeClass; import org.apache.ldap.common.filter.ExprNode; -import org.apache.ldap.common.berlib.asn1.decoder.search.BaseSearchRequestRule; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/TimeLimitRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/TimeLimitRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/TimeLimitRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/TimeLimitRule.java Sat Feb 12 12:28:39 2005 @@ -17,14 +17,11 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - import org.apache.asn1.ber.TypeClass; -import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.asn1.ber.primitives.PrimitiveUtils; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.TypeClass; -import org.apache.ldap.common.berlib.asn1.decoder.search.BaseSearchRequestRule; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/TypesOnlyRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/TypesOnlyRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/TypesOnlyRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/search/TypesOnlyRule.java Sat Feb 12 12:28:39 2005 @@ -17,17 +17,14 @@ package org.apache.ldap.common.berlib.asn1.decoder.search; -import java.nio.ByteBuffer; - +import org.apache.asn1.ber.TagEnum; +import org.apache.asn1.ber.TypeClass; import org.apache.asn1.ber.digester.AbstractRule; -import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.asn1.ber.primitives.PrimitiveUtils; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.TypeClass; -import org.apache.asn1.ber.TagEnum; -import org.apache.asn1.ber.TypeClass; import org.apache.ldap.common.message.SearchRequestImpl; -import org.apache.ldap.common.berlib.asn1.decoder.search.SearchRequestProcessing; + +import java.nio.ByteBuffer; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/unbind/UnbindRequestRule.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/unbind/UnbindRequestRule.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/unbind/UnbindRequestRule.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/decoder/unbind/UnbindRequestRule.java Sat Feb 12 12:28:39 2005 @@ -17,11 +17,10 @@ package org.apache.ldap.common.berlib.asn1.decoder.unbind ; -import org.apache.ldap.common.message.UnbindRequest ; -import org.apache.ldap.common.message.UnbindRequestImpl ; - -import org.apache.asn1.ber.TypeClass ; -import org.apache.asn1.ber.digester.AbstractRule ; +import org.apache.asn1.ber.TypeClass; +import org.apache.asn1.ber.digester.AbstractRule; +import org.apache.ldap.common.message.UnbindRequest; +import org.apache.ldap.common.message.UnbindRequestImpl; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/AttributeEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/AttributeEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/AttributeEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/AttributeEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,16 +17,14 @@ package org.apache.ldap.common.berlib.asn1.encoder; +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; -import javax.naming.NamingException; import javax.naming.NamingEnumeration; +import javax.naming.NamingException; import javax.naming.directory.Attribute; Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/AttributesEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/AttributesEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/AttributesEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/AttributesEncoder.java Sat Feb 12 12:28:39 2005 @@ -16,19 +16,15 @@ */ package org.apache.ldap.common.berlib.asn1.encoder; -import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Tuple; -import org.apache.ldap.common.berlib.asn1.encoder.AttributeEncoder; +import org.apache.asn1.ber.TupleNode; +import org.apache.asn1.ber.primitives.UniversalTag; -import javax.naming.directory.Attributes; -import javax.naming.directory.Attribute; import javax.naming.NamingEnumeration; +import javax.naming.directory.Attribute; +import javax.naming.directory.Attributes; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/EncoderUtils.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/EncoderUtils.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/EncoderUtils.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/EncoderUtils.java Sat Feb 12 12:28:39 2005 @@ -17,13 +17,12 @@ package org.apache.ldap.common.berlib.asn1.encoder; -import org.apache.asn1.ber.*; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.primitives.PrimitiveUtils; import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.TagEnum; import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; +import org.apache.asn1.ber.primitives.PrimitiveUtils; +import org.apache.asn1.ber.primitives.UniversalTag; import java.nio.ByteBuffer; Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/LdapResultEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/LdapResultEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/LdapResultEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/LdapResultEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,11 +17,9 @@ package org.apache.ldap.common.berlib.asn1.encoder; -import org.apache.asn1.ber.*; -import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.ldap.common.message.LdapResult; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/ModificationItemEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/ModificationItemEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/ModificationItemEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/ModificationItemEncoder.java Sat Feb 12 12:28:39 2005 @@ -16,18 +16,14 @@ */ package org.apache.ldap.common.berlib.asn1.encoder; -import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.Tuple; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; -import org.apache.ldap.common.berlib.asn1.encoder.AttributeEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; +import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.TupleNode; +import org.apache.asn1.ber.primitives.UniversalTag; -import javax.naming.directory.ModificationItem; import javax.naming.directory.DirContext; +import javax.naming.directory.ModificationItem; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/ReferralEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/ReferralEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/ReferralEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/ReferralEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,14 +17,11 @@ package org.apache.ldap.common.berlib.asn1.encoder; -import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.Tuple; -import org.apache.asn1.ber.Length; import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.TupleNode; import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.LdapTag; - import org.apache.ldap.common.message.Referral; import java.util.Iterator; Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/SnickersLdapEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/SnickersLdapEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/SnickersLdapEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/SnickersLdapEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,47 +17,55 @@ package org.apache.ldap.common.berlib.asn1.encoder; -import org.apache.asn1.codec.EncoderException; -import org.apache.asn1.codec.stateful.StatefulEncoder; -import org.apache.ldap.common.message.*; -import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.TupleEncodingVisitor; import org.apache.asn1.ber.DeterminateLengthVisitor; import org.apache.asn1.ber.TupleEncodingVisitor; import org.apache.asn1.ber.TupleNode; -import org.apache.ldap.common.berlib.asn1.encoder.bind.BindRequestEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.bind.BindResponseEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.search.SearchResponseEntryEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.search.SearchResponseReferenceEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.unbind.UnbindRequestEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.delete.DeleteRequestEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.delete.DeleteResponseEncoder; +import org.apache.asn1.codec.EncoderException; +import org.apache.asn1.codec.stateful.EncoderCallback; +import org.apache.asn1.codec.stateful.EncoderMonitor; +import org.apache.asn1.codec.stateful.StatefulEncoder; +import org.apache.ldap.common.berlib.asn1.encoder.abandon.AbandonRequestEncoder; import org.apache.ldap.common.berlib.asn1.encoder.add.AddRequestEncoder; import org.apache.ldap.common.berlib.asn1.encoder.add.AddResponseEncoder; +import org.apache.ldap.common.berlib.asn1.encoder.bind.BindRequestEncoder; +import org.apache.ldap.common.berlib.asn1.encoder.bind.BindResponseEncoder; import org.apache.ldap.common.berlib.asn1.encoder.compare.CompareRequestEncoder; import org.apache.ldap.common.berlib.asn1.encoder.compare.CompareResponseEncoder; +import org.apache.ldap.common.berlib.asn1.encoder.delete.DeleteRequestEncoder; +import org.apache.ldap.common.berlib.asn1.encoder.delete.DeleteResponseEncoder; import org.apache.ldap.common.berlib.asn1.encoder.extended.ExtendedRequestEncoder; import org.apache.ldap.common.berlib.asn1.encoder.extended.ExtendedResponseEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.abandon.AbandonRequestEncoder; import org.apache.ldap.common.berlib.asn1.encoder.modify.ModifyRequestEncoder; import org.apache.ldap.common.berlib.asn1.encoder.modify.ModifyResponseEncoder; import org.apache.ldap.common.berlib.asn1.encoder.modifyDn.ModifyDnRequestEncoder; import org.apache.ldap.common.berlib.asn1.encoder.modifyDn.ModifyDnResponseEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.unbind.UnbindRequestEncoder; import org.apache.ldap.common.berlib.asn1.encoder.search.SearchRequestEncoder; import org.apache.ldap.common.berlib.asn1.encoder.search.SearchResponseDoneEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.search.*; -import org.apache.ldap.common.berlib.asn1.encoder.modifyDn.ModifyDnRequestEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.modifyDn.ModifyDnResponseEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.extended.ExtendedRequestEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.delete.DeleteRequestEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.delete.DeleteResponseEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.bind.BindRequestEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.add.AddRequestEncoder; -import org.apache.asn1.codec.stateful.EncoderCallback; -import org.apache.asn1.codec.stateful.EncoderMonitor; -import org.apache.asn1.codec.stateful.*; -import org.apache.asn1.codec.EncoderException; +import org.apache.ldap.common.berlib.asn1.encoder.search.SearchResponseEntryEncoder; +import org.apache.ldap.common.berlib.asn1.encoder.search.SearchResponseReferenceEncoder; +import org.apache.ldap.common.berlib.asn1.encoder.unbind.UnbindRequestEncoder; +import org.apache.ldap.common.message.AbandonRequest; +import org.apache.ldap.common.message.AddRequest; +import org.apache.ldap.common.message.AddResponse; +import org.apache.ldap.common.message.BindRequest; +import org.apache.ldap.common.message.BindResponse; +import org.apache.ldap.common.message.CompareRequest; +import org.apache.ldap.common.message.CompareResponse; +import org.apache.ldap.common.message.DeleteRequest; +import org.apache.ldap.common.message.DeleteResponse; +import org.apache.ldap.common.message.ExtendedRequest; +import org.apache.ldap.common.message.ExtendedResponse; +import org.apache.ldap.common.message.Message; +import org.apache.ldap.common.message.MessageTypeEnum; +import org.apache.ldap.common.message.ModifyDnRequest; +import org.apache.ldap.common.message.ModifyDnResponse; +import org.apache.ldap.common.message.ModifyRequest; +import org.apache.ldap.common.message.ModifyResponse; +import org.apache.ldap.common.message.SearchRequest; +import org.apache.ldap.common.message.SearchResponseDone; +import org.apache.ldap.common.message.SearchResponseEntry; +import org.apache.ldap.common.message.SearchResponseReference; +import org.apache.ldap.common.message.UnbindRequest; Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/abandon/AbandonRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/abandon/AbandonRequestEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/abandon/AbandonRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/abandon/AbandonRequestEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,20 +17,14 @@ package org.apache.ldap.common.berlib.asn1.encoder.abandon; -import org.apache.ldap.common.message.AbandonRequest; - +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; +import org.apache.ldap.common.message.AbandonRequest; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/add/AddResponseEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/add/AddResponseEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/add/AddResponseEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/add/AddResponseEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,20 +17,14 @@ package org.apache.ldap.common.berlib.asn1.encoder.add; -import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; -import org.apache.ldap.common.berlib.asn1.LdapTag; - import org.apache.ldap.common.message.AddResponse; Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/bind/BindRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/bind/BindRequestEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/bind/BindRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/bind/BindRequestEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,19 +17,15 @@ package org.apache.ldap.common.berlib.asn1.encoder.bind; -import org.apache.ldap.common.message.BindRequest; - +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TupleNode; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; - import org.apache.commons.lang.NotImplementedException; +import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; +import org.apache.ldap.common.message.BindRequest; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/bind/BindResponseEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/bind/BindResponseEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/bind/BindResponseEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/bind/BindResponseEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,21 +17,16 @@ package org.apache.ldap.common.berlib.asn1.encoder.bind; -import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Length; -import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; -import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; +import org.apache.commons.lang.NotImplementedException; import org.apache.ldap.common.berlib.asn1.LdapTag; - +import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; +import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; import org.apache.ldap.common.message.BindResponse; - -import org.apache.commons.lang.NotImplementedException; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/compare/CompareRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/compare/CompareRequestEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/compare/CompareRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/compare/CompareRequestEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,18 +17,14 @@ package org.apache.ldap.common.berlib.asn1.encoder.compare; -import org.apache.ldap.common.message.CompareRequest; - -import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; +import org.apache.ldap.common.message.CompareRequest; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/compare/CompareResponseEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/compare/CompareResponseEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/compare/CompareResponseEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/compare/CompareResponseEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,21 +17,15 @@ package org.apache.ldap.common.berlib.asn1.encoder.compare; +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.delete.DeleteResponseEncoder; -import org.apache.ldap.common.berlib.asn1.LdapTag; - -import org.apache.ldap.common.message.DeleteResponse; import org.apache.ldap.common.message.CompareResponse; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; -import org.apache.asn1.ber.*; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/delete/DeleteRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/delete/DeleteRequestEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/delete/DeleteRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/delete/DeleteRequestEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,17 +17,14 @@ package org.apache.ldap.common.berlib.asn1.encoder.delete; -import org.apache.ldap.common.message.DeleteRequest; - -import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.asn1.ber.primitives.UniversalTag; +import org.apache.ldap.common.message.DeleteRequest; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/delete/DeleteResponseEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/delete/DeleteResponseEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/delete/DeleteResponseEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/delete/DeleteResponseEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,20 +17,15 @@ package org.apache.ldap.common.berlib.asn1.encoder.delete; +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; -import org.apache.ldap.common.berlib.asn1.LdapTag; - import org.apache.ldap.common.message.DeleteResponse; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/extended/ExtendedRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/extended/ExtendedRequestEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/extended/ExtendedRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/extended/ExtendedRequestEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,17 +17,14 @@ package org.apache.ldap.common.berlib.asn1.encoder.extended; -import org.apache.ldap.common.message.ExtendedRequest; - +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; -import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.asn1.ber.TupleNode; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; +import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; +import org.apache.ldap.common.message.ExtendedRequest; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/extended/ExtendedResponseEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/extended/ExtendedResponseEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/extended/ExtendedResponseEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/extended/ExtendedResponseEncoder.java Sat Feb 12 12:28:39 2005 @@ -16,19 +16,15 @@ */ package org.apache.ldap.common.berlib.asn1.encoder.extended; -import org.apache.ldap.common.message.ExtendedResponse; -import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Tuple; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; +import org.apache.asn1.ber.TupleNode; +import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; +import org.apache.ldap.common.message.ExtendedResponse; /** * An encoder that transforms a stub into a TupleNode tree representing the Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modify/ModifyRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modify/ModifyRequestEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modify/ModifyRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modify/ModifyRequestEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,21 +17,18 @@ package org.apache.ldap.common.berlib.asn1.encoder.modify; -import java.util.Iterator; -import javax.naming.directory.ModificationItem; - -import org.apache.ldap.common.message.ModifyRequest; - -import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; -import org.apache.asn1.ber.*; - +import org.apache.asn1.ber.TupleNode; +import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.encoder.ModificationItemEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.ModificationItemEncoder; +import org.apache.ldap.common.message.ModifyRequest; + +import javax.naming.directory.ModificationItem; +import java.util.Iterator; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modify/ModifyResponseEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modify/ModifyResponseEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modify/ModifyResponseEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modify/ModifyResponseEncoder.java Sat Feb 12 12:28:39 2005 @@ -16,17 +16,15 @@ */ package org.apache.ldap.common.berlib.asn1.encoder.modify; -import org.apache.ldap.common.message.ModifyResponse; -import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.Tuple; -import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; +import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.TupleNode; +import org.apache.asn1.ber.primitives.UniversalTag; import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; +import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; +import org.apache.ldap.common.message.ModifyResponse; /** * Encoder which generates a TupleNode tree from a ModifyResponse PDU stub. Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modifyDn/ModifyDnRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modifyDn/ModifyDnRequestEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modifyDn/ModifyDnRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modifyDn/ModifyDnRequestEncoder.java Sat Feb 12 12:28:39 2005 @@ -16,17 +16,14 @@ */ package org.apache.ldap.common.berlib.asn1.encoder.modifyDn; -import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.message.ModifyDnRequest; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; /** * Encoder which generates a TupleNode tree from a ModifyDnRequest PDU stub. Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modifyDn/ModifyDnResponseEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modifyDn/ModifyDnResponseEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modifyDn/ModifyDnResponseEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/modifyDn/ModifyDnResponseEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,20 +17,15 @@ package org.apache.ldap.common.berlib.asn1.encoder.modifyDn; -import org.apache.ldap.common.message.ModifyDnResponse; - +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; -import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; +import org.apache.ldap.common.message.ModifyDnResponse; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchRequestEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchRequestEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,20 +17,26 @@ package org.apache.ldap.common.berlib.asn1.encoder.search; -import org.apache.ldap.common.filter.*; -import org.apache.ldap.common.message.SearchRequest; - -import org.apache.asn1.ber.*; +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.TagEnum; +import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.LdapTag; +import org.apache.ldap.common.filter.BranchNode; +import org.apache.ldap.common.filter.ExprNode; +import org.apache.ldap.common.filter.ExtensibleNode; +import org.apache.ldap.common.filter.LeafNode; +import org.apache.ldap.common.filter.PresenceNode; +import org.apache.ldap.common.filter.SimpleNode; +import org.apache.ldap.common.filter.SubstringNode; +import org.apache.ldap.common.message.SearchRequest; -import java.util.Iterator; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchResponseDoneEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchResponseDoneEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchResponseDoneEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchResponseDoneEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,22 +17,15 @@ package org.apache.ldap.common.berlib.asn1.encoder.search; -import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; -import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.encoder.LdapResultEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.LdapTag; - import org.apache.ldap.common.message.SearchResponseDone; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Tuple; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchResponseEntryEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchResponseEntryEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchResponseEntryEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchResponseEntryEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,20 +17,15 @@ package org.apache.ldap.common.berlib.asn1.encoder.search; -import org.apache.ldap.common.message.SearchResponseEntry; - +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; - import org.apache.ldap.common.berlib.asn1.LdapTag; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.AttributesEncoder; import org.apache.ldap.common.berlib.asn1.encoder.AttributesEncoder; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; +import org.apache.ldap.common.message.SearchResponseEntry; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchResponseReferenceEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchResponseReferenceEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchResponseReferenceEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/search/SearchResponseReferenceEncoder.java Sat Feb 12 12:28:39 2005 @@ -17,18 +17,15 @@ package org.apache.ldap.common.berlib.asn1.encoder.search; -import org.apache.ldap.common.message.SearchResponseReference; - -import org.apache.asn1.ber.TupleNode; +import org.apache.asn1.ber.DefaultMutableTupleNode; import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; +import org.apache.asn1.ber.Tuple; +import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; - import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.ldap.common.berlib.asn1.encoder.AttributesEncoder; -import org.apache.ldap.common.berlib.asn1.encoder.ReferralEncoder; import org.apache.ldap.common.berlib.asn1.encoder.ReferralEncoder; +import org.apache.ldap.common.message.SearchResponseReference; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/unbind/UnbindRequestEncoder.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/unbind/UnbindRequestEncoder.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/unbind/UnbindRequestEncoder.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/java/org/apache/ldap/common/berlib/asn1/encoder/unbind/UnbindRequestEncoder.java Sat Feb 12 12:28:39 2005 @@ -16,16 +16,14 @@ */ package org.apache.ldap.common.berlib.asn1.encoder.unbind; -import org.apache.ldap.common.message.UnbindRequest; +import org.apache.asn1.ber.DefaultMutableTupleNode; +import org.apache.asn1.ber.Length; +import org.apache.asn1.ber.Tuple; import org.apache.asn1.ber.TupleNode; import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; import org.apache.ldap.common.berlib.asn1.LdapTag; import org.apache.ldap.common.berlib.asn1.encoder.EncoderUtils; -import org.apache.asn1.ber.primitives.UniversalTag; -import org.apache.asn1.ber.DefaultMutableTupleNode; -import org.apache.asn1.ber.Length; -import org.apache.asn1.ber.*; +import org.apache.ldap.common.message.UnbindRequest; /** Modified: incubator/directory/ldap/trunk/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/add/AddResponseRuleTest.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/add/AddResponseRuleTest.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/add/AddResponseRuleTest.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/add/AddResponseRuleTest.java Sat Feb 12 12:28:39 2005 @@ -18,17 +18,12 @@ import org.apache.ldap.common.berlib.asn1.decoder.testutils.RuleTestCase; -import org.apache.ldap.common.berlib.asn1.decoder.testutils.TestUtils; import org.apache.ldap.common.message.AddResponse; import org.apache.ldap.common.message.AddResponseImpl; -import org.apache.ldap.common.message.LdapResult; import org.apache.ldap.common.message.LdapResultImpl; -import org.apache.ldap.common.message.Referral; import org.apache.ldap.common.message.ReferralImpl; import org.apache.ldap.common.message.ResultCodeEnum; -import java.util.Iterator; - /** * Tests the population of an LdapResult using a ResultRule. @@ -41,9 +36,10 @@ { public void testAddResponse() throws Exception { - // build the PDU - AddResponseImpl resp = new AddResponseImpl( 8 ) ; - LdapResultImpl result = new LdapResultImpl( resp ) ; + byte[] pdu = new byte[] {0x30, 0x4C, 0x02, 0x01, 0x08, 0x69, 0x47, 0x0A, 0x01, 0x33, 0x04, 0x1F, 0x75, 0x69, 0x64, 0x3D, 0x61, 0x6B, 0x61, 0x72, 0x61, 0x73, 0x75, 0x6C, 0x75, 0x2C, 0x64, 0x63, 0x3D, 0x65, 0x78, 0x61, 0x6D, 0x70, 0x6C, 0x65, 0x2C, 0x64, 0x63, 0x3D, 0x63, 0x6F, 0x6D, 0x04, 0x11, 0x41, 0x6E, 0x20, 0x45, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x4D, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x21, 0xFFFFFFA3, 0x0E, 0x04, 0x05, 0x68, 0x65, 0x6C, 0x6C, 0x6F, 0x04, 0x05, 0x77, 0x6F, 0x72, 0x6C, 0x64}; + + AddResponseImpl expected = new AddResponseImpl( 8 ) ; + LdapResultImpl result = new LdapResultImpl( expected ) ; result.setResultCode( ResultCodeEnum.BUSY ) ; result.setErrorMessage( "An Error Message!" ) ; result.setMatchedDn( "uid=akarasulu,dc=example,dc=com" ) ; @@ -51,53 +47,9 @@ referral.addLdapUrl( "hello" ) ; referral.addLdapUrl( "world" ) ; result.setReferral( referral ) ; - resp.setLdapResult( result ) ; - System.out.println( "Generated AddResponse for test:" ) ; - System.out.println( TestUtils.printTupleTree( resp ) ) ; - - AddResponse decoded = ( AddResponse ) - snickersDecode( snaccEncode( resp ) ) ; + expected.setLdapResult( result ) ; - assertNotNull( decoded ) ; - assertEquals( resp.getMessageId(), decoded.getMessageId() ) ; - LdapResult decodedResult = resp.getLdapResult() ; - assertEquals( result.getResultCode(), decodedResult.getResultCode() ) ; - assertEquals( result.getErrorMessage(), - decodedResult.getErrorMessage() ) ; - assertEquals( result.getMatchedDn(), - decodedResult.getMatchedDn() ) ; - Referral decodedRef = result.getReferral() ; - Iterator urls = referral.getLdapUrls().iterator() ; - Iterator decodedUrls = decodedRef.getLdapUrls().iterator() ; - - while( urls.hasNext() && decodedUrls.hasNext() ) - { - assertEquals( urls.next(), decodedUrls.next() ) ; - } - - assertFalse( urls.hasNext() ) ; - assertFalse( decodedUrls.hasNext() ) ; + AddResponse decoded = ( AddResponse ) decode( pdu ) ; + assertEquals( expected, decoded ); } - - /** - * TODO: Fails but should replace the above at some point. - */ -// public void testSamplePDU() throws Exception -// { -// byte[] pdu = new byte[] {0x30, 0x4C, 0x02, 0x01, 0x08, 0x69, 0x47, 0x0A, 0x01, 0x33, 0x04, 0x1F, 0x75, 0x69, 0x64, 0x3D, 0x61, 0x6B, 0x61, 0x72, 0x61, 0x73, 0x75, 0x6C, 0x75, 0x2C, 0x64, 0x63, 0x3D, 0x65, 0x78, 0x61, 0x6D, 0x70, 0x6C, 0x65, 0x2C, 0x64, 0x63, 0x3D, 0x63, 0x6F, 0x6D, 0x04, 0x11, 0x41, 0x6E, 0x20, 0x45, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x4D, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x21, 0xFFFFFFA3, 0x0E, 0x04, 0x05, 0x68, 0x65, 0x6C, 0x6C, 0x6F, 0x04, 0x05, 0x77, 0x6F, 0x72, 0x6C, 0x64}; -// -// AddResponseImpl expected = new AddResponseImpl( 8 ) ; -// LdapResultImpl result = new LdapResultImpl( expected ) ; -// result.setResultCode( ResultCodeEnum.BUSY ) ; -// result.setErrorMessage( "An Error Message!" ) ; -// result.setMatchedDn( "uid=akarasulu,dc=example,dc=com" ) ; -// ReferralImpl referral = new ReferralImpl( result ) ; -// referral.addLdapUrl( "hello" ) ; -// referral.addLdapUrl( "world" ) ; -// result.setReferral( referral ) ; -// expected.setLdapResult( result ) ; -// -// AddResponse decoded = ( AddResponse ) decode( pdu ) ; -// assertEquals( expected, decoded ); -// } } Modified: incubator/directory/ldap/trunk/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/bind/BindResponseRuleTest.java URL: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/bind/BindResponseRuleTest.java?view=diff&r1=153540&r2=153541 ============================================================================== --- incubator/directory/ldap/trunk/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/bind/BindResponseRuleTest.java (original) +++ incubator/directory/ldap/trunk/apache-provider/src/test/org/apache/ldap/common/berlib/asn1/decoder/bind/BindResponseRuleTest.java Sat Feb 12 12:28:39 2005 @@ -41,10 +41,12 @@ { public void testBindResponse() throws Exception { - // build the PDU - BindResponseImpl resp = new BindResponseImpl( 540 ) ; - resp.setServerSaslCreds( "hello".getBytes() ) ; - LdapResultImpl result = new LdapResultImpl( resp ) ; + byte[] pdu = new byte[] {0x30, 0x54, 0x02, 0x02, 0x02, 0x1C, 0x61, 0x4E, 0x0A, 0x01, 0x33, 0x04, 0x1F, 0x75, 0x69, 0x64, 0x3D, 0x61, 0x6B, 0x61, 0x72, 0x61, 0x73, 0x75, 0x6C, 0x75, 0x2C, 0x64, 0x63, 0x3D, 0x65, 0x78, 0x61, 0x6D, 0x70, 0x6C, 0x65, 0x2C, 0x64, 0x63, 0x3D, 0x63, 0x6F, 0x6D, 0x04, 0x11, 0x41, 0x6E, 0x20, 0x45, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x4D, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x21, 0xFFFFFFA3, 0x0E, 0x04, 0x05, 0x68, 0x65, 0x6C, 0x6C, 0x6F, 0x04, 0x05, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0xFFFFFF87, 0x05, 0x68, 0x65, 0x6C, 0x6C, 0x6F}; + BindResponse decoded = ( BindResponse ) decode( pdu ) ; + + BindResponseImpl expected = new BindResponseImpl( 540 ) ; + expected.setServerSaslCreds( "hello".getBytes() ) ; + LdapResultImpl result = new LdapResultImpl( expected ) ; result.setResultCode( ResultCodeEnum.BUSY ) ; result.setErrorMessage( "An Error Message!" ) ; result.setMatchedDn( "uid=akarasulu,dc=example,dc=com" ) ; @@ -52,58 +54,8 @@ referral.addLdapUrl( "hello" ) ; referral.addLdapUrl( "world" ) ; result.setReferral( referral ) ; - resp.setLdapResult( result ) ; - System.out.println( "Generated BindResponse for test:" ) ; - System.out.println( TestUtils.printTupleTree( resp ) ) ; - - - BindResponse decoded = ( BindResponse ) - snickersDecode( snaccEncode( resp ) ) ; + expected.setLdapResult( result ) ; - assertNotNull( decoded ) ; - assertEquals( resp.getMessageId(), decoded.getMessageId() ) ; - assertNotNull( decoded.getServerSaslCreds() ) ; - assertEquals( new String( resp.getServerSaslCreds() ), - new String( decoded.getServerSaslCreds() ) ) ; - LdapResult decodedResult = resp.getLdapResult() ; - assertEquals( result.getResultCode(), decodedResult.getResultCode() ) ; - assertEquals( result.getErrorMessage(), - decodedResult.getErrorMessage() ) ; - assertEquals( result.getMatchedDn(), - decodedResult.getMatchedDn() ) ; - Referral decodedRef = result.getReferral() ; - Iterator urls = referral.getLdapUrls().iterator() ; - Iterator decodedUrls = decodedRef.getLdapUrls().iterator() ; - - while( urls.hasNext() && decodedUrls.hasNext() ) - { - assertEquals( urls.next(), decodedUrls.next() ) ; - } - - assertFalse( urls.hasNext() ) ; - assertFalse( decodedUrls.hasNext() ) ; + assertEquals( expected, decoded ); } - - /** - * TODO: somehow, decoded result code is success instead of BUSY. To investigate ... - */ -// public void testAgainstPrecomputedPDU() throws Exception -// { -// byte[] pdu = new byte[] {0x30, 0x54, 0x02, 0x02, 0x02, 0x1C, 0x61, 0x4E, 0x0A, 0x01, 0x33, 0x04, 0x1F, 0x75, 0x69, 0x64, 0x3D, 0x61, 0x6B, 0x61, 0x72, 0x61, 0x73, 0x75, 0x6C, 0x75, 0x2C, 0x64, 0x63, 0x3D, 0x65, 0x78, 0x61, 0x6D, 0x70, 0x6C, 0x65, 0x2C, 0x64, 0x63, 0x3D, 0x63, 0x6F, 0x6D, 0x04, 0x11, 0x41, 0x6E, 0x20, 0x45, 0x72, 0x72, 0x6F, 0x72, 0x20, 0x4D, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x21, 0xFFFFFFA3, 0x0E, 0x04, 0x05, 0x68, 0x65, 0x6C, 0x6C, 0x6F, 0x04, 0x05, 0x77, 0x6F, 0x72, 0x6C, 0x64, 0xFFFFFF87, 0x05, 0x68, 0x65, 0x6C, 0x6C, 0x6F}; -// BindResponse decoded = ( BindResponse ) decode( pdu ) ; -// -// BindResponseImpl expected = new BindResponseImpl( 540 ) ; -// expected.setServerSaslCreds( "hello".getBytes() ) ; -// LdapResultImpl result = new LdapResultImpl( expected ) ; -// result.setResultCode( ResultCodeEnum.BUSY ) ; -// result.setErrorMessage( "An Error Message!" ) ; -// result.setMatchedDn( "uid=akarasulu,dc=example,dc=com" ) ; -// ReferralImpl referral = new ReferralImpl( result ) ; -// referral.addLdapUrl( "hello" ) ; -// referral.addLdapUrl( "world" ) ; -// result.setReferral( referral ) ; -// expected.setLdapResult( result ) ; -// -// assertEquals( expected, decoded ); -// } }
