Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java?rev=1056056&r1=1056055&r2=1056056&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java Thu Jan 6 20:23:17 2011 @@ -40,9 +40,9 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.message.AliasDerefMode; -import org.apache.directory.shared.ldap.message.LdapEncoder; +import org.apache.directory.shared.ldap.codec.message.LdapEncoder; 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.ldap.message.control.Control; import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer; import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer; @@ -62,7 +62,7 @@ import org.junit.runner.RunWith; public class SearchRequestSubstringTest { /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + LdapEncoder encoder = new org.apache.directory.shared.ldap.codec.message.LdapEncoder(); static Map oids = new HashMap(); @@ -321,7 +321,7 @@ public class SearchRequestSubstringTest assertEquals( true, searchRequest.getTypesOnly() ); // (objectclass=t*) - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); SubstringFilter substringFilter = ( SubstringFilter ) filter; assertNotNull( substringFilter ); @@ -449,7 +449,7 @@ public class SearchRequestSubstringTest assertEquals( true, searchRequest.getTypesOnly() ); // (objectclass=t*) - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); SubstringFilter substringFilter = ( SubstringFilter ) filter; assertNotNull( substringFilter ); @@ -571,7 +571,7 @@ public class SearchRequestSubstringTest assertEquals( true, searchRequest.getTypesOnly() ); // (objectclass=t*) - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); SubstringFilter substringFilter = ( SubstringFilter ) filter; assertNotNull( substringFilter ); @@ -941,7 +941,7 @@ public class SearchRequestSubstringTest assertEquals( true, searchRequest.getTypesOnly() ); // (objectclass=t*) - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); SubstringFilter substringFilter = ( SubstringFilter ) filter; assertNotNull( substringFilter ); @@ -1064,7 +1064,7 @@ public class SearchRequestSubstringTest assertEquals( true, searchRequest.getTypesOnly() ); // (objectclass=t*) - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); SubstringFilter substringFilter = ( SubstringFilter ) filter; assertNotNull( substringFilter ); @@ -1329,7 +1329,7 @@ public class SearchRequestSubstringTest assertEquals( true, searchRequest.getTypesOnly() ); // (objectclass=t*) - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); SubstringFilter substringFilter = ( SubstringFilter ) filter; assertNotNull( substringFilter ); Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?rev=1056056&r1=1056055&r2=1056056&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java Thu Jan 6 20:23:17 2011 @@ -46,12 +46,12 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.filter.SearchScope; import org.apache.directory.shared.ldap.message.AliasDerefMode; -import org.apache.directory.shared.ldap.message.LdapEncoder; +import org.apache.directory.shared.ldap.codec.message.LdapEncoder; import org.apache.directory.shared.ldap.message.Message; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.SearchRequest; -import org.apache.directory.shared.ldap.message.SearchRequestImpl; -import org.apache.directory.shared.ldap.message.SearchResultDoneImpl; +import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl; +import org.apache.directory.shared.ldap.codec.message.SearchResultDoneImpl; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.ldap.schema.normalizers.DeepTrimToLowerNormalizer; import org.apache.directory.shared.ldap.schema.normalizers.OidNormalizer; @@ -72,7 +72,7 @@ import org.junit.runner.RunWith; public class SearchRequestTest { /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + LdapEncoder encoder = new org.apache.directory.shared.ldap.codec.message.LdapEncoder(); static Map oids = new HashMap(); @@ -685,7 +685,7 @@ public class SearchRequestTest assertEquals( false, searchRequest.getTypesOnly() ); // (objectClass = *) - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); PresentFilter presentFilter = ( PresentFilter ) filter; assertNotNull( presentFilter ); assertEquals( "objectClass", presentFilter.getAttributeDescription() ); @@ -875,7 +875,7 @@ public class SearchRequestTest assertEquals( false, searchRequest.getTypesOnly() ); // (objectClass = *) - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); PresentFilter presentFilter = ( PresentFilter ) filter; assertNotNull( presentFilter ); assertEquals( "objectClass", presentFilter.getAttributeDescription() ); @@ -1420,7 +1420,7 @@ public class SearchRequestTest assertEquals( 0, searchRequest.getTimeLimit() ); assertEquals( false, searchRequest.getTypesOnly() ); - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); assertTrue( filter instanceof PresentFilter ); assertEquals( "objectClass", ( ( PresentFilter ) filter ).getAttributeDescription() ); @@ -2722,7 +2722,7 @@ public class SearchRequestTest assertEquals( true, searchRequest.getTypesOnly() ); // >= - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); AttributeValueAssertionFilter greaterThanFilter = ( AttributeValueAssertionFilter ) filter; assertNotNull( greaterThanFilter ); @@ -2814,7 +2814,7 @@ public class SearchRequestTest assertEquals( true, searchRequest.getTypesOnly() ); // >= - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); AttributeValueAssertionFilter greaterThanFilter = ( AttributeValueAssertionFilter ) filter; assertNotNull( greaterThanFilter ); @@ -3772,7 +3772,7 @@ public class SearchRequestTest assertEquals( true, searchRequest.getTypesOnly() ); // (&(... - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); AndFilter andFilter = ( AndFilter ) filter; assertNotNull( andFilter ); @@ -3908,7 +3908,7 @@ public class SearchRequestTest assertEquals( true, searchRequest.getTypesOnly() ); // (&(... - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); AndFilter andFilter = ( AndFilter ) filter; assertNotNull( andFilter ); @@ -4054,7 +4054,7 @@ public class SearchRequestTest assertEquals( true, searchRequest.getTypesOnly() ); // (&(... - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); AndFilter andFilter = ( AndFilter ) filter; assertNotNull( andFilter ); @@ -4197,7 +4197,7 @@ public class SearchRequestTest assertEquals( true, searchRequest.getTypesOnly() ); // (&(... - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); AndFilter andFilter = ( AndFilter ) filter; assertNotNull( andFilter ); @@ -4598,7 +4598,7 @@ public class SearchRequestTest assertEquals( 0, searchRequest.getTimeLimit() ); assertEquals( false, searchRequest.getTypesOnly() ); - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); PresentFilter presentFilter = ( PresentFilter ) filter; assertNotNull( presentFilter ); assertEquals( "objectClass", presentFilter.getAttributeDescription() ); @@ -4777,7 +4777,7 @@ public class SearchRequestTest assertEquals( false, searchRequest.getTypesOnly() ); // (&(... - Filter filter = ( ( SearchRequestImpl ) searchRequest ).getCurrentFilter(); + Filter filter = ( (org.apache.directory.shared.ldap.codec.message.SearchRequestImpl) searchRequest ).getCurrentFilter(); AndFilter andFilter = ( AndFilter ) filter; assertNotNull( andFilter ); Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java?rev=1056056&r1=1056055&r2=1056056&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java Thu Jan 6 20:23:17 2011 @@ -34,7 +34,6 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.Asn1Container; import org.apache.directory.shared.asn1.DecoderException; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; -import org.apache.directory.shared.ldap.message.LdapEncoder; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.message.SearchResultDone; import org.apache.directory.shared.ldap.message.control.Control; @@ -53,7 +52,7 @@ import org.junit.runner.RunWith; public class SearchResultDoneTest { /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + org.apache.directory.shared.ldap.codec.message.LdapEncoder encoder = new org.apache.directory.shared.ldap.codec.message.LdapEncoder(); /** Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java?rev=1056056&r1=1056055&r2=1056056&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java Thu Jan 6 20:23:17 2011 @@ -38,7 +38,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.ldap.codec.LdapMessageContainer; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; -import org.apache.directory.shared.ldap.message.LdapEncoder; +import org.apache.directory.shared.ldap.codec.message.LdapEncoder; import org.apache.directory.shared.ldap.message.SearchResultEntry; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.util.Strings; @@ -56,7 +56,7 @@ import org.junit.runner.RunWith; public class SearchResultEntryTest { /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + org.apache.directory.shared.ldap.codec.message.LdapEncoder encoder = new LdapEncoder(); /** Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java?rev=1056056&r1=1056055&r2=1056056&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java Thu Jan 6 20:23:17 2011 @@ -37,7 +37,7 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.Asn1Decoder; import org.apache.directory.shared.asn1.ber.Asn1Container; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; -import org.apache.directory.shared.ldap.message.LdapEncoder; +import org.apache.directory.shared.ldap.codec.message.LdapEncoder; import org.apache.directory.shared.ldap.message.Referral; import org.apache.directory.shared.ldap.message.SearchResultReference; import org.apache.directory.shared.ldap.message.control.Control; Modified: directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java?rev=1056056&r1=1056055&r2=1056056&view=diff ============================================================================== --- directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java (original) +++ directory/shared/branches/alex_refactoring/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java Thu Jan 6 20:23:17 2011 @@ -34,9 +34,9 @@ import org.apache.directory.shared.asn1. import org.apache.directory.shared.asn1.ber.Asn1Container; import org.apache.directory.shared.asn1.EncoderException; import org.apache.directory.shared.ldap.codec.LdapMessageContainer; -import org.apache.directory.shared.ldap.message.LdapEncoder; +import org.apache.directory.shared.ldap.codec.message.LdapEncoder; import org.apache.directory.shared.ldap.message.UnbindRequest; -import org.apache.directory.shared.ldap.message.UnbindRequestImpl; +import org.apache.directory.shared.ldap.codec.message.UnbindRequestImpl; import org.apache.directory.shared.ldap.message.control.Control; import org.apache.directory.shared.util.Strings; import org.junit.Test; @@ -51,7 +51,7 @@ import org.junit.runner.RunWith; public class UnBindRequestTest { /** The encoder instance */ - LdapEncoder encoder = new LdapEncoder(); + org.apache.directory.shared.ldap.codec.message.LdapEncoder encoder = new LdapEncoder(); /**