directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1201295 [3/4] - in /directory/shared/branches/shared-txns: all/ asn1/api/ asn1/ber/ asn1/ber/src/main/java/org/apache/directory/shared/asn1/ber/tlv/ dsml/engine/ dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/ dsml/par...
Date Sat, 12 Nov 2011 18:16:07 GMT
Modified: directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java (original)
+++ directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java Sat Nov 12 18:16:03 2011
@@ -206,7 +206,7 @@ public class LdapNetworkConnection exten
     private List<String> 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<String>();
 
-        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 )
         {

Propchange: directory/shared/branches/shared-txns/ldap/codec/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -5,5 +5,5 @@
 /directory/shared/branches/shared-osgi/ldap/codec/core:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
-/directory/shared/trunk/ldap/codec/core:1177670-1188737
+/directory/shared/trunk/ldap/codec/core:1177670-1201283
 /directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original)
+++ directory/shared/branches/shared-txns/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java Sat Nov 12 18:16:03 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try
@@ -507,7 +507,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a BindRequest Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try
@@ -651,7 +651,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a BindRequest Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try
@@ -757,7 +757,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a BindRequest Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try
@@ -845,7 +845,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a BindRequest Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try
@@ -935,7 +935,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a BindRequest Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try
@@ -1287,7 +1287,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a BindRequest Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try
@@ -1406,7 +1406,7 @@ public class SearchRequestTest extends A
         String decodedPdu = Strings.dumpBytes(stream.array());
         stream.flip();
 
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -1518,7 +1518,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try
@@ -1801,7 +1801,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try
@@ -1923,7 +1923,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try
@@ -2045,7 +2045,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try
@@ -2170,7 +2170,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try
@@ -2295,7 +2295,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -2337,7 +2337,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -2379,7 +2379,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -2421,7 +2421,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -2463,7 +2463,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -2505,7 +2505,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -2547,7 +2547,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -2590,7 +2590,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -2639,7 +2639,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -2730,7 +2730,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -2821,7 +2821,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -2890,7 +2890,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -2937,7 +2937,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -2984,7 +2984,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -3032,7 +3032,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         // Decode a SearchRequest message
@@ -3073,7 +3073,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a LdapMessage Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( 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<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try
@@ -4633,7 +4633,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a BindRequest Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try
@@ -4744,7 +4744,7 @@ public class SearchRequestTest extends A
         stream.flip();
 
         // Allocate a BindRequest Container
-        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer = 
+        LdapMessageContainer<SearchRequestDecorator> ldapMessageContainer =
             new LdapMessageContainer<SearchRequestDecorator>( codec );
 
         try

Propchange: directory/shared/branches/shared-txns/ldap/codec/standalone/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -5,6 +5,6 @@
 /directory/shared/branches/shared-osgi/ldap/codec/standalone:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
-/directory/shared/trunk/ldap/codec/standalone:1177670-1188737
+/directory/shared/trunk/ldap/codec/standalone:1177670-1201283
 /directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1068227
 /directory/shared/trunk/ldap-codec-standalone:1068228-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/ldap/extras/aci/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -5,5 +5,5 @@
 /directory/shared/branches/shared-osgi/ldap/extras/aci:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
-/directory/shared/trunk/ldap/extras/aci:1177670-1188737
+/directory/shared/trunk/ldap/extras/aci:1177670-1201283
 /directory/shared/trunk/ldap-extras/aci:1068228-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/ldap/extras/codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -5,6 +5,6 @@
 /directory/shared/branches/shared-osgi/ldap/extras/codec:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
-/directory/shared/trunk/ldap/extras/codec:1177670-1188737
+/directory/shared/trunk/ldap/extras/codec:1177670-1201283
 /directory/shared/trunk/ldap-codec:1067785-1067995
 /directory/shared/trunk/ldap-extras/codec:1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/ldap/extras/codec-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -6,7 +6,7 @@
 /directory/shared/branches/shared-osgi/ldap/extras/codec-api:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
-/directory/shared/trunk/ldap/extras/codec-api:1177670-1188737
+/directory/shared/trunk/ldap/extras/codec-api:1177670-1201283
 /directory/shared/trunk/ldap-codec:1067785-1067995
 /directory/shared/trunk/ldap-extras/codec:1068025-1072732,1072797-1073546
 /directory/shared/trunk/ldap-extras/codec-api:1073547-1075328

Modified: directory/shared/branches/shared-txns/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java (original)
+++ directory/shared/branches/shared-txns/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/StoredProcedureRequestImpl.java Sat Nov 12 18:16:03 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.extras.extended;
 
@@ -131,8 +131,8 @@ public class StoredProcedureRequestImpl 
         {
             this.procedure = new byte[ procedure.length ];
             System.arraycopy( procedure, 0, this.procedure, 0, procedure.length );
-        } 
-        else 
+        }
+        else
         {
             this.procedure = null;
         }
@@ -196,7 +196,7 @@ public class StoredProcedureRequestImpl 
      * {@inheritDoc}
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings( value = "BC_IMPOSSIBLE_INSTANCEOF",
-    		justification = "False positive")
+            justification = "False positive")
     public Object getParameterTypeString( int index )
     {
         if ( ! language.equals( "java" ) )
@@ -239,7 +239,7 @@ public class StoredProcedureRequestImpl 
      * {@inheritDoc}
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings( value = "BC_IMPOSSIBLE_INSTANCEOF",
-    		justification = "False positive")
+            justification = "False positive")
     public Object getParameterValueString( int index )
     {
         if ( ! language.equals( "java" ) )
@@ -258,11 +258,11 @@ public class StoredProcedureRequestImpl 
                     }
                     catch ( IntegerDecoderException e )
                     {
-                        throw new RuntimeException( "Failed to decode INTEGER: " + 
+                        throw new RuntimeException( "Failed to decode INTEGER: " +
                             Strings.dumpBytes( ( byte[] ) obj ), e );
                     }
                 }
-                else 
+                else
                 {
                     return str;
                 }

Propchange: directory/shared/branches/shared-txns/ldap/extras/sp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -5,5 +5,5 @@
 /directory/shared/branches/shared-osgi/ldap/extras/sp:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
-/directory/shared/trunk/ldap/extras/sp:1177670-1188738
+/directory/shared/trunk/ldap/extras/sp:1177670-1201283
 /directory/shared/trunk/ldap-extras/sp:1068228-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/ldap/extras/sp/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/sp/pom.xml?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/sp/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/extras/sp/pom.xml Sat Nov 12 18:16:03 2011
@@ -54,11 +54,6 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-standalone</artifactId>
-    </dependency> 
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>shared-ldap-extras-codec</artifactId>
     </dependency> 
 

Propchange: directory/shared/branches/shared-txns/ldap/extras/trigger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -5,5 +5,5 @@
 /directory/shared/branches/shared-osgi/ldap/extras/trigger:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
-/directory/shared/trunk/ldap/extras/trigger:1177670-1188738
+/directory/shared/trunk/ldap/extras/trigger:1177670-1201283
 /directory/shared/trunk/ldap-extras/trigger:1068228-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/ldap/extras/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -5,5 +5,5 @@
 /directory/shared/branches/shared-osgi/ldap/extras/util:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
-/directory/shared/trunk/ldap/extras/util:1177670-1188738
+/directory/shared/trunk/ldap/extras/util:1177670-1201283
 /directory/shared/trunk/ldap-extras/util:1068228-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/ldap/extras/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/util/pom.xml?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/util/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/extras/util/pom.xml Sat Nov 12 18:16:03 2011
@@ -36,31 +36,21 @@
       <artifactId>junit-addons</artifactId>
       <scope>test</scope>
     </dependency>
-    
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-util</artifactId>
-    </dependency> 
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>shared-asn1-api</artifactId>
-    </dependency> 
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>shared-i18n</artifactId>
-    </dependency> 
-
+    </dependency>
+    
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-model</artifactId>
-    </dependency> 
+      <artifactId>shared-ldap-codec-core</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-codec-standalone</artifactId>
-    </dependency> 
+      <artifactId>shared-ldap-model</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

Propchange: directory/shared/branches/shared-txns/ldap/model/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -5,5 +5,5 @@
 /directory/shared/branches/shared-osgi/ldap/model:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067491
-/directory/shared/trunk/ldap/model:1177670-1188738
+/directory/shared/trunk/ldap/model:1177670-1201283
 /directory/shared/trunk/ldap-model:1067492-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:16:03 2011
@@ -7,7 +7,7 @@
 /directory/shared/branches/shared-subtree/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980350-980351
-/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1177670-1188738
+/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1177670-1201283
 /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1066124-1067491
 /directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:519076-580502
 /directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1067492-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/controls/OpaqueControl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/controls/OpaqueControl.java?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/controls/OpaqueControl.java (original)
+++ directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/message/controls/OpaqueControl.java Sat Nov 12 18:16:03 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.model.message.controls;
 
@@ -26,7 +26,7 @@ import org.apache.directory.shared.util.
 
 /**
  * A final {@link Control} implementation intended specifically for handling
- * controls who's values cannot be encoded or decoded by the codec service. 
+ * controls who's values cannot be encoded or decoded by the codec service.
  * This situation results when no Control factory is found to be
  * registered for this control's OID. Hence additional opaque value handling
  * methods are included to manage the opaque control value.
@@ -35,9 +35,9 @@ import org.apache.directory.shared.util.
  */
 public final class OpaqueControl extends AbstractControl implements Control
 {
-	/** The opaque encoded value */
-	private byte[] value;
-	
+    /** The opaque encoded value */
+    private byte[] value;
+    
     /**
      * Creates a Control with a specific OID.
      *
@@ -53,7 +53,7 @@ public final class OpaqueControl extends
      * Creates a Control with a specific OID, and criticality set.
      *
      * @param oid The OID of this Control.
-     * @param criticality true if this Control is critical, false otherwise. 
+     * @param criticality true if this Control is critical, false otherwise.
      */
     public OpaqueControl( String oid, boolean criticality )
     {
@@ -66,7 +66,7 @@ public final class OpaqueControl extends
      */
     public byte[] getEncodedValue()
     {
-    	return value;
+        return value;
     }
     
     
@@ -77,18 +77,18 @@ public final class OpaqueControl extends
      */
     public void setEncodedValue( byte[] value )
     {
-    	this.value = Strings.copy( value );
+        this.value = Strings.copy( value );
     }
     
     
     /**
-     * Tells if the control has a stored value. Note that if the 
+     * Tells if the control has a stored value. Note that if the
      * control has an empty value, this method will return true.
      * 
      * @return true if the control has a value
      */
     public boolean hasEncodedValue()
     {
-    	return value != null;
+        return value != null;
     }
 }

Modified: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java (original)
+++ directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/name/Dn.java Sat Nov 12 18:16:03 2011
@@ -331,7 +331,7 @@ public class Dn implements Iterable<Rdn>
      * Creates a Dn concatenating a Rdn and a Dn.
      *
      * @param rdn the Rdn to add to the Dn
-     * @param dn the Dn 
+     * @param dn the Dn
      * @throws LdapInvalidDnException If the resulting Dn is invalid
      */
     public Dn( Rdn rdn, Dn dn ) throws LdapInvalidDnException
@@ -547,7 +547,7 @@ public class Dn implements Iterable<Rdn>
 
     /**
      * Tells if the current Dn is a parent of another Dn.<br>
-     * For instance, <b>dc=com</b> is a ancestor 
+     * For instance, <b>dc=com</b> is a ancestor
      * of <b>dc=example, dc=com</b>
      *
      * @param dn The child
@@ -595,7 +595,7 @@ public class Dn implements Iterable<Rdn>
      */
     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<Rdn>
      *
      * @return <code>true</code> if the Dn is the RootDSE's Dn
      */
-    public boolean isRootDSE()
+    public boolean isRootDse()
     {
         return ( rdns.size() == 0 );
     }
@@ -713,7 +713,7 @@ public class Dn implements Iterable<Rdn>
      * Dn descendant = dn.getDescendantOf( "dc=apache, dc=org" );
      * 
      * // At this point, the descendant contains cn=test, dc=server, dc=directory"
-     * </pre> 
+     * </pre>
      */
     public Dn getDescendantOf( String ancestor ) throws LdapInvalidDnException
     {
@@ -734,7 +734,7 @@ public class Dn implements Iterable<Rdn>
      * Dn descendant = dn.getDescendantOf( "dc=apache, dc=org" );
      * 
      * // At this point, the descendant contains cn=test, dc=server, dc=directory"
-     * </pre> 
+     * </pre>
      */
     public Dn getDescendantOf( Dn ancestor ) throws LdapInvalidDnException
     {
@@ -795,7 +795,7 @@ public class Dn implements Iterable<Rdn>
      * Dn ancestor = dn.getAncestorOf( "cn=test, dc=server, dc=directory" );
      * 
      * // At this point, the ancestor contains "dc=apache, dc=org"
-     * </pre> 
+     * </pre>
      */
     public Dn getAncestorOf( String descendant ) throws LdapInvalidDnException
     {
@@ -815,7 +815,7 @@ public class Dn implements Iterable<Rdn>
      * Dn ancestor = dn.getAncestorOf( new Dn( "cn=test, dc=server, dc=directory" ) );
      * 
      * // At this point, the ancestor contains "dc=apache, dc=org"
-     * </pre> 
+     * </pre>
      */
     public Dn getAncestorOf( Dn descendant ) throws LdapInvalidDnException
     {
@@ -1008,7 +1008,7 @@ public class Dn implements Iterable<Rdn>
      * @return <code>true</code> if the two instances are equals
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "EQ_CHECK_FOR_OPERAND_NOT_COMPATIBLE_WITH_THIS",
-    		justification = "String is a special case")
+            justification = "String is a special case")
     @Override
     public boolean equals( Object obj )
     {
@@ -1241,7 +1241,7 @@ public class Dn implements Iterable<Rdn>
 
 
     /**
-     * Iterate over the inner Rdn. The Rdn are returned from 
+     * Iterate over the inner Rdn. The Rdn are returned from
      * the rightmost to the leftmost. For instance, the following code :<br/>
      * <pre>
      * Dn dn = new Dn( "sn=test, dc=apache, dc=org );

Modified: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java (original)
+++ directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/BitStringComparator.java Sat Nov 12 18:16:03 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.model.schema.comparators;
 
@@ -52,7 +52,7 @@ public class BitStringComparator extends
      * Implementation of the Compare method
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
-    		justification ="false positive")
+            justification ="false positive")
     public int compare( String bs1, String bs2 )
     {
         LOG.debug( "comparing BitString objects '{}' with '{}'", bs1, bs2 );
@@ -66,7 +66,7 @@ public class BitStringComparator extends
         }
 
         // Then, deal with one of bs1 or bs2 being null
-        // Both can't be null, because then they would 
+        // Both can't be null, because then they would
         // have been caught by the previous test
         if ( ( bs1 == null ) || ( bs2 == null ) )
         {

Modified: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java (original)
+++ directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/GeneralizedTimeComparator.java Sat Nov 12 18:16:03 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.model.schema.comparators;
 
@@ -45,7 +45,7 @@ public class GeneralizedTimeComparator e
     private static final Logger LOG = LoggerFactory.getLogger( GeneralizedTimeComparator.class );
 
     /**
-     * The GeneralizedTimeComparator constructor. Its OID is the 
+     * The GeneralizedTimeComparator constructor. Its OID is the
      * generalizedTimeOrderingMatch matching rule OID.
      */
     public GeneralizedTimeComparator( String oid )
@@ -58,7 +58,7 @@ public class GeneralizedTimeComparator e
      * Implementation of the Compare method
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
-    		justification ="false positive")
+            justification ="false positive")
     public int compare( String backendValue, String assertValue )
     {
         LOG.debug( "comparing generalizedTimeOrdering objects '{}' with '{}'", backendValue, assertValue );
@@ -72,7 +72,7 @@ public class GeneralizedTimeComparator e
         }
 
         // Then, deal with one of o1 or o2 being null
-        // Both can't be null, because then they would 
+        // Both can't be null, because then they would
         // have been caught by the previous test
         if ( ( backendValue == null ) || ( assertValue == null ) )
         {

Modified: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java (original)
+++ directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/IntegerComparator.java Sat Nov 12 18:16:03 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.model.schema.comparators;
 
@@ -74,7 +74,7 @@ public class IntegerComparator extends L
      * Implementation of the Compare method
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "RC_REF_COMPARISON",
-    		justification ="false positive")
+            justification ="false positive")
     private int compare( Long backendValue, Long assertValue )
     {
         LOG.debug( "comparing Integer objects '{}' with '{}'", backendValue, assertValue );
@@ -88,7 +88,7 @@ public class IntegerComparator extends L
         }
 
         // Then, deal with one of o1 or o2 being null
-        // Both can't be null, because then they would 
+        // Both can't be null, because then they would
         // have been caught by the previous test
         if ( ( backendValue == null ) || ( assertValue == null ) )
         {
@@ -103,7 +103,7 @@ public class IntegerComparator extends L
      * Implementation of the Compare method
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
-    		justification ="false positive")
+            justification ="false positive")
     private int compare( String backendValue, String assertValue )
     {
         LOG.debug( "comparing Integer objects '{}' with '{}'", backendValue, assertValue );
@@ -117,7 +117,7 @@ public class IntegerComparator extends L
         }
 
         // Then, deal with one of o1 or o2 being null
-        // Both can't be null, because then they would 
+        // Both can't be null, because then they would
         // have been caught by the previous test
         if ( ( backendValue == null ) || ( assertValue == null ) )
         {
@@ -143,8 +143,8 @@ public class IntegerComparator extends L
             throw new IllegalArgumentException( I18n.err( I18n.ERR_04224, assertValue ) );
         }
 
-        BigInteger b1 = new BigInteger( ( String ) backendValue );
-        BigInteger b2 = new BigInteger( ( String ) assertValue );
+        BigInteger b1 = new BigInteger( backendValue );
+        BigInteger b2 = new BigInteger( assertValue );
 
         return b1.compareTo( b2 );
     }

Modified: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java (original)
+++ directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/LongComparator.java Sat Nov 12 18:16:03 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.model.schema.comparators;
 
@@ -54,7 +54,7 @@ public class LongComparator extends Ldap
      * @return 1 if obj1 > obj2, 0 if obj1 == obj2, -1 if obj1 < obj2
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "RC_REF_COMPARISON",
-    		justification ="false positive")
+            justification ="false positive")
     public int compare( Long obj1, Long obj2 )
     {
         if ( obj1 == obj2 )

Modified: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java (original)
+++ directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/NumericStringComparator.java Sat Nov 12 18:16:03 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.model.schema.comparators;
 
@@ -56,7 +56,7 @@ public class NumericStringComparator ext
      * Implementation of the Compare method
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
-    		justification ="false positive")
+            justification ="false positive")
     public int compare( String backendValue, String assertValue )
     {
         LOG.debug( "comparing numericStringOrdering objects '{}' with '{}'", backendValue, assertValue );
@@ -70,7 +70,7 @@ public class NumericStringComparator ext
         }
 
         // Then, deal with one of o1 or o2 being null
-        // Both can't be null, because then they would 
+        // Both can't be null, because then they would
         // have been caught by the previous test
         if ( ( backendValue == null ) || ( assertValue == null ) )
         {

Modified: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java (original)
+++ directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java Sat Nov 12 18:16:03 2011
@@ -109,5 +109,6 @@ public class SerializableComparator<E> e
 
         ((LdapComparator<E>)wrapped).setSchemaManager( schemaManager );
         super.setSchemaManager( schemaManager );
+        this.schemaManager = schemaManager;
     }
 }

Modified: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java?rev=1201295&r1=1201294&r2=1201295&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java (original)
+++ directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/StringComparator.java Sat Nov 12 18:16:03 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.model.schema.comparators;
 
@@ -56,7 +56,7 @@ public class StringComparator extends Ld
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
     @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "ES_COMPARING_PARAMETER_STRING_WITH_EQ",
-    		justification ="false positive")
+            justification ="false positive")
     public int compare( String s1, String s2 )
     {
         LOG.debug( "comparing String objects '{}' with '{}'", s1, s2 );



Mime
View raw message