Author: elecharny Date: Sat Nov 12 05:49:47 2011 New Revision: 1201196 URL: http://svn.apache.org/viewvc?rev=1201196&view=rev Log: Renamed rootDSE to rootDse (as we renamed DN to Dn, etc...) Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1201196&r1=1201195&r2=1201196&view=diff ============================================================================== --- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original) +++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Sat Nov 12 05:49:47 2011 @@ -206,7 +206,7 @@ public class LdapNetworkConnection exten private List supportedControls; /** The ROOT DSE entry */ - private Entry rootDSE; + private Entry rootDse; /** A flag indicating that the BindRequest has been issued and successfully authenticated the user */ private AtomicBoolean authenticated = new AtomicBoolean( false ); @@ -2552,7 +2552,7 @@ public class LdapNetworkConnection exten throw new IllegalArgumentException( "The entry Dn must not be null" ); } - if ( entryDn.isRootDSE() ) + if ( entryDn.isRootDse() ) { throw new IllegalArgumentException( "The RootDSE cannot be moved" ); } @@ -2562,7 +2562,7 @@ public class LdapNetworkConnection exten throw new IllegalArgumentException( "The new Dn must not be null" ); } - if ( newDn.isRootDSE() ) + if ( newDn.isRootDse() ) { throw new IllegalArgumentException( "The RootDSE cannot be the target" ); } @@ -3381,14 +3381,14 @@ public class LdapNetworkConnection exten return supportedControls; } - if ( rootDSE == null ) + if ( rootDse == null ) { fetchRootDSE(); } supportedControls = new ArrayList(); - Attribute attr = rootDSE.get( SchemaConstants.SUPPORTED_CONTROL_AT ); + Attribute attr = rootDse.get( SchemaConstants.SUPPORTED_CONTROL_AT ); for ( Value value : attr ) { @@ -3549,7 +3549,7 @@ public class LdapNetworkConnection exten { cursor = search( "", "(objectClass=*)", SearchScope.OBJECT, "*", "+" ); cursor.next(); - rootDSE = cursor.get(); + rootDse = cursor.get(); } catch ( Exception e ) { Modified: directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?rev=1201196&r1=1201195&r2=1201196&view=diff ============================================================================== --- directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original) +++ directory/shared/trunk/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java Sat Nov 12 05:49:47 2011 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.ldap.codec.search; @@ -144,7 +144,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x02, 0x03, ( byte ) 0xE8, // sizeLimit INTEGER (0 .. maxInt), (1000) - 0x02, 0x02, 0x03, ( byte ) 0xE8, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x02, 0x03, ( byte ) 0xE8, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF, // typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x3C, // Filter ::= CHOICE { @@ -179,7 +179,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -307,7 +307,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x02, 0x03, ( byte ) 0xE8, // sizeLimit INTEGER (0 .. maxInt), (1000) - 0x02, 0x02, 0x03, ( byte ) 0xE8, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x02, 0x03, ( byte ) 0xE8, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF, // typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x3C, // Filter ::= CHOICE { @@ -317,15 +317,15 @@ public class SearchRequestTest extends A // Assertion, // Assertion ::= SEQUENCE { 0x04, 0x0B, // attributeDesc AttributeDescription (LDAPString), - 'o', 'b', 'j', 'e', 'c', 't', 'c', 'l', 'a', 's', 's', 0x04, 0x03, // attributeDesc AttributeDescription (LDAPString), + 'o', 'b', 'j', 'e', 'c', 't', 'c', 'l', 'a', 's', 's', 0x04, 0x03, // attributeDesc AttributeDescription (LDAPString), 't', 'o', 'p', ( byte ) 0xA6, 0x0E, // lessOrEqual [3] Assertion, 0x04, 0x02, // Assertion ::= SEQUENCE { 'o', 'u', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x08, // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x08, // assertionValue AssertionValue (OCTET STRING) } 'c', 'o', 'n', 't', 'a', 'c', 't', 's', ( byte ) 0xA2, 0x14, // not [2] Filter, ( byte ) 0xA5, 0x12, // greaterOrEqual [5] Assertion, // Assertion ::= SEQUENCE { - 0x04, 0x0B, // attributeDesc AttributeDescription (LDAPString), + 0x04, 0x0B, // attributeDesc AttributeDescription (LDAPString), 'o', 'b', 'j', 'e', 'c', 't', 'c', 'l', 'a', 's', 's', 0x04, 0x03, 't', 't', 't', // assertionValue AssertionValue (OCTET STRING) } // attributes AttributeDescriptionList } 0x30, 0x15, // AttributeDescriptionList ::= SEQUENCE OF @@ -339,7 +339,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -507,7 +507,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -651,7 +651,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -757,7 +757,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -845,7 +845,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -935,7 +935,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -1048,19 +1048,19 @@ public class SearchRequestTest extends A ( byte ) 0xa0, 0x45, // controls 0x30, 0x28, 0x04, 0x16, // control - '1', '.', '2', '.', '8', '4', '0', '.', - '1', '1', '3', '5', '5', '6', '.', '1', - '.', '4', '.', '3', '1', '9', + '1', '.', '2', '.', '8', '4', '0', '.', + '1', '1', '3', '5', '5', '6', '.', '1', + '.', '4', '.', '3', '1', '9', 0x01, 0x01, ( byte ) 0xff, // criticality: false - 0x04, 0x0b, - 0x30, 0x09, - 0x02, 0x01, 0x02, + 0x04, 0x0b, + 0x30, 0x09, + 0x02, 0x01, 0x02, 0x04, 0x04, 0x47, 0x00, 0x00, 0x00, // value: pageSize=2 - 0x30, 0x19, + 0x30, 0x19, 0x04, 0x17, // control - '2', '.', '1', '6', '.', '8', '4', '0', - '.', '1', '.', '1', '1', '3', '7', '3', - '0', '.', '3', '.', '4', '.', '2', + '2', '.', '1', '6', '.', '8', '4', '0', + '.', '1', '.', '1', '1', '3', '7', '3', + '0', '.', '3', '.', '4', '.', '2', }; byte[] asn1BERJava6 = new byte[] @@ -1078,20 +1078,20 @@ public class SearchRequestTest extends A 'o', 'b', 'j', 'e', 'c', 't', 'C', 'l', 'a', 's', 's', 0x30, 0x00, // Attributes = '*' ( byte ) 0xa0, 0x45, // controls - 0x30, 0x19, + 0x30, 0x19, 0x04, 0x17, // control - '2', '.', '1', '6', '.', '8', '4', '0', - '.', '1', '.', '1', '1', '3', '7', '3', - '0', '.', '3', '.', '4', '.', '2', + '2', '.', '1', '6', '.', '8', '4', '0', + '.', '1', '.', '1', '1', '3', '7', '3', + '0', '.', '3', '.', '4', '.', '2', 0x30, 0x28, 0x04, 0x16, // control - '1', '.', '2', '.', '8', '4', '0', '.', - '1', '1', '3', '5', '5', '6', '.', '1', - '.', '4', '.', '3', '1', '9', + '1', '.', '2', '.', '8', '4', '0', '.', + '1', '1', '3', '5', '5', '6', '.', '1', + '.', '4', '.', '3', '1', '9', 0x01, 0x01, ( byte ) 0xff, // criticality: false - 0x04, 0x0b, - 0x30, 0x09, - 0x02, 0x01, 0x02, + 0x04, 0x0b, + 0x30, 0x09, + 0x02, 0x01, 0x02, 0x04, 0x04, 0x47, 0x00, 0x00, 0x00, // value: pageSize=2 }; @@ -1108,7 +1108,7 @@ public class SearchRequestTest extends A streamJava5.put( asn1BERJava5 ); String decodedPduJava5 = Strings.dumpBytes(streamJava5.array()); - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -1287,7 +1287,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -1406,7 +1406,7 @@ public class SearchRequestTest extends A String decodedPdu = Strings.dumpBytes(stream.array()); stream.flip(); - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -1432,7 +1432,7 @@ public class SearchRequestTest extends A assertEquals( subEntryControlOID, subEntryControl.getOid() ); assertTrue( subEntryControl.isCritical() ); assertTrue( subEntryControl instanceof SubentriesDecorator ); - assertTrue( ( ( Subentries ) ( ( SubentriesDecorator ) subEntryControl ).getDecorated() ).isVisible() ); + assertTrue( ( ( SubentriesDecorator ) subEntryControl ).getDecorated().isVisible() ); assertEquals( "dc=my-domain,dc=com", searchRequest.getBase().toString() ); assertEquals( SearchScope.SUBTREE, searchRequest.getScope() ); @@ -1483,7 +1483,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -1518,7 +1518,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -1563,7 +1563,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x02, 0x03, ( byte ) 0xE8, // sizeLimit INTEGER (0 .. maxInt), (1000) - 0x02, 0x02, 0x03, ( byte ) 0xE8, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x02, 0x03, ( byte ) 0xE8, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF, // typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x3C, // Filter ::= CHOICE { @@ -1598,7 +1598,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -1725,7 +1725,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x02, 0x03, ( byte ) 0xE8, // sizeLimit INTEGER (0 .. maxInt), (1000) - 0x02, 0x02, 0x03, ( byte ) 0xE8, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x02, 0x03, ( byte ) 0xE8, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF, // typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x3C, // Filter ::= CHOICE { @@ -1759,7 +1759,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -1801,7 +1801,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -1851,7 +1851,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x02, 0x03, ( byte ) 0xE8, // sizeLimit INTEGER (0 .. maxInt), (1000) - 0x02, 0x02, 0x03, ( byte ) 0xE8, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x02, 0x03, ( byte ) 0xE8, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF, // typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x3C, // Filter ::= CHOICE { @@ -1885,7 +1885,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -1923,7 +1923,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -1973,7 +1973,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x02, 0x03, ( byte ) 0xE8, // sizeLimit INTEGER (0 .. maxInt), (1000) - 0x02, 0x02, 0x03, ( byte ) 0xE8, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x02, 0x03, ( byte ) 0xE8, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF, // typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x3C, // Filter ::= CHOICE { @@ -2007,7 +2007,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -2045,7 +2045,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2095,7 +2095,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x01, ( byte ) 0xFF, // sizeLimit INTEGER (0 .. maxInt), (1000) - 0x02, 0x02, 0x03, ( byte ) 0xE8, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x02, 0x03, ( byte ) 0xE8, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF, // typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x3C, // Filter ::= CHOICE { @@ -2129,7 +2129,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -2170,7 +2170,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2220,7 +2220,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x02, 0x03, ( byte ) 0xE8, // sizeLimit INTEGER (0 .. maxInt), (1000) - 0x02, 0x01, ( byte ) 0xFF, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x01, ( byte ) 0xFF, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF, // typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x3C, // Filter ::= CHOICE { @@ -2254,7 +2254,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -2295,7 +2295,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2337,7 +2337,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2379,7 +2379,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2421,7 +2421,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2463,7 +2463,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2505,7 +2505,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2547,7 +2547,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2590,7 +2590,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2639,7 +2639,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2730,7 +2730,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2821,7 +2821,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2890,7 +2890,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2937,7 +2937,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -2984,7 +2984,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -3032,7 +3032,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -3073,7 +3073,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a LdapMessage Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); // Decode a SearchRequest message @@ -3099,7 +3099,7 @@ public class SearchRequestTest extends A assertEquals( 0, searchRequest.getTimeLimit() ); assertEquals( false, searchRequest.getTypesOnly() ); - // And + // And ExprNode filter = searchRequest.getFilter(); AndNode andNode = ( AndNode ) filter; @@ -3171,14 +3171,14 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x01, 0x00, // sizeLimit INTEGER (0 .. maxInt), (0) - 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF,// typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA3, 0x06, // Filter ::= CHOICE { // equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'a', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } // attributes AttributeDescriptionList } 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); @@ -3187,7 +3187,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -3272,7 +3272,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x01, 0x00, // sizeLimit INTEGER (0 .. maxInt), (0) - 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF,// typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x08, // Filter ::= CHOICE { @@ -3280,7 +3280,7 @@ public class SearchRequestTest extends A // equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'a', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } // attributes AttributeDescriptionList } 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); @@ -3289,7 +3289,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -3382,7 +3382,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x01, 0x00, // sizeLimit INTEGER (0 .. maxInt), (0) - 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF,// typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x10, // Filter ::= CHOICE { @@ -3390,12 +3390,12 @@ public class SearchRequestTest extends A // equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'a', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } ( byte ) 0xA3, 0x06, // equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'c', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'd', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'd', // assertionValue AssertionValue (OCTET STRING) } // attributes AttributeDescriptionList } 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); @@ -3404,7 +3404,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -3504,7 +3504,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x01, 0x00, // sizeLimit INTEGER (0 .. maxInt), (0) - 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF,// typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x0A, // Filter ::= CHOICE { and [0] SET OF Filter, @@ -3512,7 +3512,7 @@ public class SearchRequestTest extends A ( byte ) 0xA3, 0x06,// equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'a', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); @@ -3520,7 +3520,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -3620,7 +3620,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x01, 0x00, // sizeLimit INTEGER (0 .. maxInt), (0) - 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF,// typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x12, // Filter ::= CHOICE { and [0] SET OF Filter, @@ -3629,12 +3629,12 @@ public class SearchRequestTest extends A // equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'a', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } ( byte ) 0xA3, 0x06, // equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'c', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'd', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'd', // assertionValue AssertionValue (OCTET STRING) } 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); @@ -3642,7 +3642,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -3749,7 +3749,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x01, 0x00, // sizeLimit INTEGER (0 .. maxInt), (0) - 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF,// typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x12, // Filter ::= CHOICE { and [0] SET OF Filter, @@ -3757,12 +3757,12 @@ public class SearchRequestTest extends A ( byte ) 0xA3, 0x06,// equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'a', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } ( byte ) 0xA3, 0x06, // equalityMatch [3] Assertion, // equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'c', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'd', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'd', // assertionValue AssertionValue (OCTET STRING) } 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); @@ -3770,7 +3770,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -3877,7 +3877,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x01, 0x00, // sizeLimit INTEGER (0 .. maxInt), (0) - 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF,// typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x1A, // Filter ::= CHOICE { and [0] SET OF Filter, @@ -3885,16 +3885,16 @@ public class SearchRequestTest extends A ( byte ) 0xA3, 0x06,// equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'a', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } ( byte ) 0xA3, 0x06,// equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'c', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'd', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'd', // assertionValue AssertionValue (OCTET STRING) } ( byte ) 0xA3, 0x06, // equalityMatch [3] Assertion, // equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'e', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'f', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'f', // assertionValue AssertionValue (OCTET STRING) } 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); @@ -3902,7 +3902,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -4017,24 +4017,24 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x01, 0x00, // sizeLimit INTEGER (0 .. maxInt), (0) - 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF,// typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x1A, // Filter ::= CHOICE { and [0] SET OF Filter, ( byte ) 0xA3, 0x06, // equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'a', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } ( byte ) 0xA1, 0x10, // Filter ::= CHOICE { or [1] SET OF Filter, ( byte ) 0xA3, 0x06,// equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'c', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'd', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'd', // assertionValue AssertionValue (OCTET STRING) } ( byte ) 0xA3, 0x06,// equalityMatch [3] Assertion, // equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'e', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'f', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'f', // assertionValue AssertionValue (OCTET STRING) } 0x30, 0x00, // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); @@ -4042,7 +4042,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -4156,7 +4156,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x01, 0x00, // sizeLimit INTEGER (0 .. maxInt), (0) - 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF,// typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x14, // Filter ::= CHOICE { and [0] SET OF Filter, @@ -4164,13 +4164,13 @@ public class SearchRequestTest extends A ( byte ) 0xA3, 0x06,// equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'a', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } ( byte ) 0xA0, 0x08, // Filter ::= CHOICE { and [0] SET OF Filter, ( byte ) 0xA3, 0x06,// equalityMatch [3] Assertion, // equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'c', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'd', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'd', // assertionValue AssertionValue (OCTET STRING) } 0x30, 0x00 // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); @@ -4178,7 +4178,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -4292,7 +4292,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x01, 0x00, // sizeLimit INTEGER (0 .. maxInt), (0) - 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF,// typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x1C, // Filter ::= CHOICE { and [0] SET OF Filter, @@ -4300,17 +4300,17 @@ public class SearchRequestTest extends A ( byte ) 0xA3, 0x06,// equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'a', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'b', // assertionValue AssertionValue (OCTET STRING) } ( byte ) 0xA3, 0x06,// equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'c', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'd', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'd', // assertionValue AssertionValue (OCTET STRING) } ( byte ) 0xA0, 0x08, // Filter ::= CHOICE { and [0] SET OF Filter, ( byte ) 0xA3, 0x06,// equalityMatch [3] Assertion, // equalityMatch [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'e', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'f', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'f', // assertionValue AssertionValue (OCTET STRING) } 0x30, 0x00 // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); @@ -4318,7 +4318,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -4439,7 +4439,7 @@ public class SearchRequestTest extends A // derefFindingBaseObj (2), // derefAlways (3) }, 0x02, 0x01, 0x00, // sizeLimit INTEGER (0 .. maxInt), (0) - 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) + 0x02, 0x01, 0x00, // timeLimit INTEGER (0 .. maxInt), (1000) 0x01, 0x01, ( byte ) 0xFF,// typesOnly BOOLEAN, (TRUE) // filter Filter, ( byte ) 0xA0, 0x1C, // Filter ::= CHOICE { and [0] SET OF Filter, @@ -4452,7 +4452,7 @@ public class SearchRequestTest extends A ( byte ) 0xA5, 0x06,// greaterOrEqual [3] Assertion, // Assertion ::= SEQUENCE { 0x04, 0x01, 'e', // attributeDesc AttributeDescription (LDAPString), - 0x04, 0x01, 'f', // assertionValue AssertionValue (OCTET STRING) } + 0x04, 0x01, 'f', // assertionValue AssertionValue (OCTET STRING) } 0x30, 0x00 // AttributeDescriptionList ::= SEQUENCE OF AttributeDescription } ); @@ -4460,7 +4460,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -4554,7 +4554,7 @@ public class SearchRequestTest extends A * for rootDSE */ @Test - public void testDecodeSearchRequestRootDSE() + public void testDecodeSearchRequestRootDse() { Asn1Decoder ldapDecoder = new Asn1Decoder(); @@ -4568,7 +4568,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -4633,7 +4633,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try @@ -4744,7 +4744,7 @@ public class SearchRequestTest extends A stream.flip(); // Allocate a BindRequest Container - LdapMessageContainer ldapMessageContainer = + LdapMessageContainer ldapMessageContainer = new LdapMessageContainer( codec ); try Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java?rev=1201196&r1=1201195&r2=1201196&view=diff ============================================================================== --- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java (original) +++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java Sat Nov 12 05:49:47 2011 @@ -595,7 +595,7 @@ public class Dn implements Iterable */ public boolean isDescendantOf( Dn dn ) { - if ( ( dn == null ) || dn.isRootDSE() ) + if ( ( dn == null ) || dn.isRootDse() ) { return true; } @@ -640,7 +640,7 @@ public class Dn implements Iterable * * @return true if the Dn is the RootDSE's Dn */ - public boolean isRootDSE() + public boolean isRootDse() { return ( rdns.size() == 0 ); }