directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1235374 [24/27] - in /directory/shared/trunk: ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/ ldap/model/src/main/java/org/apache/directory/shared/ldap/model/csn/ ldap/model/src/main/java/org/apache/directory/sha...
Date Tue, 24 Jan 2012 17:44:32 GMT
Modified: directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/shared/converter/schema/TestSchemaToLdif.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/shared/converter/schema/TestSchemaToLdif.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/shared/converter/schema/TestSchemaToLdif.java (original)
+++ directory/shared/trunk/ldap/schema/converter/src/test/java/org/apache/directory/shared/converter/schema/TestSchemaToLdif.java Tue Jan 24 17:44:03 2012
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.converter.schema;
 
+
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
@@ -37,27 +38,28 @@ import org.junit.runner.RunWith;
 @Concurrency()
 public class TestSchemaToLdif
 {
-    private static final String HEADER = 
-        "#\n" +
-        "#  Licensed to the Apache Software Foundation (ASF) under one\n" +
-        "#  or more contributor license agreements.  See the NOTICE file\n" +
-        "#  distributed with this work for additional information\n" +
-        "#  regarding copyright ownership.  The ASF licenses this file\n" +
-        "#  to you under the Apache License, Version 2.0 (the\n" +
-        "#  \"License\"); you may not use this file except in compliance\n" +
-        "#  with the License.  You may obtain a copy of the License at\n" +
-        "#  \n" +
-        "#    http://www.apache.org/licenses/LICENSE-2.0\n" +
-        "#  \n" +
-        "#  Unless required by applicable law or agreed to in writing,\n" +
-        "#  software distributed under the License is distributed on an\n" +
-        "#  \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n" +
-        "#  KIND, either express or implied.  See the License for the\n" +
-        "#  specific language governing permissions and limitations\n" +
-        "#  under the License. \n" +
+    private static final String HEADER =
         "#\n" +
-        "version: 1\n" +
-        "\n";  
+            "#  Licensed to the Apache Software Foundation (ASF) under one\n" +
+            "#  or more contributor license agreements.  See the NOTICE file\n" +
+            "#  distributed with this work for additional information\n" +
+            "#  regarding copyright ownership.  The ASF licenses this file\n" +
+            "#  to you under the Apache License, Version 2.0 (the\n" +
+            "#  \"License\"); you may not use this file except in compliance\n" +
+            "#  with the License.  You may obtain a copy of the License at\n" +
+            "#  \n" +
+            "#    http://www.apache.org/licenses/LICENSE-2.0\n" +
+            "#  \n" +
+            "#  Unless required by applicable law or agreed to in writing,\n" +
+            "#  software distributed under the License is distributed on an\n" +
+            "#  \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n" +
+            "#  KIND, either express or implied.  See the License for the\n" +
+            "#  specific language governing permissions and limitations\n" +
+            "#  under the License. \n" +
+            "#\n" +
+            "version: 1\n" +
+            "\n";
+
 
     private String transform( String name ) throws ParserException, IOException
     {
@@ -65,19 +67,20 @@ public class TestSchemaToLdif
         Schema schema = new Schema();
         schema.setName( name );
         schema.setInput( getClass().getResourceAsStream( name + ".schema" ) );
-        
+
         Writer out = new StringWriter( 2048 );
         schema.setOutput( out );
         schemas.add( schema );
-        
+
         SchemaToLdif.transform( schemas );
-        
+
         String res = out.toString();
         out.close();
-        
+
         return res;
     }
 
+
     //-------------------------------------------------------------------------
     // Tests for ObjectClass
     //-------------------------------------------------------------------------
@@ -85,331 +88,350 @@ public class TestSchemaToLdif
     public void testConvertOC() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOC, ou=schema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-name: objectClass\n" +
-            "m-description: An objectClass\n" +
-            "m-obsolete: TRUE\n" +
-            "m-supObjectClass: top\n" +
-            "m-typeObjectClass: ABSTRACT\n" +
-            "m-must: attr1\n" +
-            "m-must: attr2\n" +
-            "m-may: attr3\n" +
-            "m-may: attr4\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOC, ou=schema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-name: objectClass\n" +
+                "m-description: An objectClass\n" +
+                "m-obsolete: TRUE\n" +
+                "m-supObjectClass: top\n" +
+                "m-typeObjectClass: ABSTRACT\n" +
+                "m-must: attr1\n" +
+                "m-must: attr2\n" +
+                "m-may: attr3\n" +
+                "m-may: attr4\n\n";
 
-        assertEquals( expected, transform( "testOC") );
+        assertEquals( expected, transform( "testOC" ) );
     }
-    
+
+
     @Test
     public void testConvertOCMinimal() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCMinimal, ou=s\n" +
-            " chema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCMinimal, ou=s\n" +
+                " chema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n\n";
 
         assertEquals( expected, transform( "testOCMinimal" ) );
     }
-    
+
+
     @Test
     public void testConvertOCNoName() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCNoName, ou=sc\n" +
-            " hema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-description: An objectClass\n" +
-            "m-obsolete: TRUE\n" +
-            "m-supObjectClass: top\n" +
-            "m-typeObjectClass: ABSTRACT\n" +
-            "m-must: attr1\n" +
-            "m-must: attr2\n" +
-            "m-may: attr3\n" +
-            "m-may: attr4\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCNoName, ou=sc\n" +
+                " hema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-description: An objectClass\n" +
+                "m-obsolete: TRUE\n" +
+                "m-supObjectClass: top\n" +
+                "m-typeObjectClass: ABSTRACT\n" +
+                "m-must: attr1\n" +
+                "m-must: attr2\n" +
+                "m-may: attr3\n" +
+                "m-may: attr4\n\n";
 
         assertEquals( expected, transform( "testOCNoName" ) );
     }
 
+
     @Test
     public void testConvertOCAbstract() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCAbstract, ou=\n" +
-            " schema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-typeObjectClass: ABSTRACT\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCAbstract, ou=\n" +
+                " schema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-typeObjectClass: ABSTRACT\n\n";
 
         assertEquals( expected, transform( "testOCAbstract" ) );
     }
 
+
     @Test
     public void testConvertOCAuxiliary() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCAuxiliary, ou\n" +
-            " =schema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-typeObjectClass: AUXILIARY\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCAuxiliary, ou\n" +
+                " =schema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-typeObjectClass: AUXILIARY\n\n";
 
         assertEquals( expected, transform( "testOCAuxiliary" ) );
     }
 
+
     @Test
     public void testConvertOCDesc() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCDesc, ou=sche\n" +
-            " ma\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-description: An objectClass\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCDesc, ou=sche\n" +
+                " ma\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-description: An objectClass\n\n";
 
         assertEquals( expected, transform( "testOCDesc" ) );
     }
 
+
     @Test
     public void testConvertOCMayOne() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCMayOne, ou=sc\n" +
-            " hema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-may: attr1\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCMayOne, ou=sc\n" +
+                " hema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-may: attr1\n\n";
 
         assertEquals( expected, transform( "testOCMayOne" ) );
     }
 
+
     @Test
     public void testConvertOCMay2() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCMay2, ou=sche\n" +
-            " ma\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-may: attr1\n" +
-            "m-may: attr2\n\n";
-        
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCMay2, ou=sche\n" +
+                " ma\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-may: attr1\n" +
+                "m-may: attr2\n\n";
+
         assertEquals( expected, transform( "testOCMay2" ) );
     }
 
+
     @Test
     public void testConvertOCMayMany() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCMayMany, ou=s\n" +
-            " chema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-may: attr1\n" +
-            "m-may: attr2\n" +
-            "m-may: attr3\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCMayMany, ou=s\n" +
+                " chema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-may: attr1\n" +
+                "m-may: attr2\n" +
+                "m-may: attr3\n\n";
 
         assertEquals( expected, transform( "testOCMayMany" ) );
     }
 
+
     @Test
     public void testConvertOCMustOne() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCMustOne, ou=s\n" +
-            " chema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-must: attr1\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCMustOne, ou=s\n" +
+                " chema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-must: attr1\n\n";
 
         assertEquals( expected, transform( "testOCMustOne" ) );
     }
 
+
     @Test
     public void testConvertOCMust2() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCMust2, ou=sch\n" +
-            " ema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-must: attr1\n" +
-            "m-must: attr2\n\n";
-        
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCMust2, ou=sch\n" +
+                " ema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-must: attr1\n" +
+                "m-must: attr2\n\n";
+
         assertEquals( expected, transform( "testOCMust2" ) );
     }
 
+
     @Test
     public void testConvertOCMustMany() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCMustMany, ou=\n" +
-            " schema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-must: attr1\n" +
-            "m-must: attr2\n" +
-            "m-must: attr3\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCMustMany, ou=\n" +
+                " schema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-must: attr1\n" +
+                "m-must: attr2\n" +
+                "m-must: attr3\n\n";
 
         assertEquals( expected, transform( "testOCMustMany" ) );
     }
 
+
     @Test
     public void testConvertOCNameOne() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCNameOne, ou=s\n" +
-            " chema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-name: objectClass\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCNameOne, ou=s\n" +
+                " chema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-name: objectClass\n\n";
 
         assertEquals( expected, transform( "testOCNameOne" ) );
     }
 
+
     @Test
     public void testConvertOCName2() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCName2, ou=sch\n" +
-            " ema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-name: oc\n" +
-            "m-name: objectClass\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCName2, ou=sch\n" +
+                " ema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-name: oc\n" +
+                "m-name: objectClass\n\n";
 
         assertEquals( expected, transform( "testOCName2" ) );
     }
 
+
     @Test
     public void testConvertOCNameMany() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCNameMany, ou=\n" +
-            " schema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-name: oc\n" +
-            "m-name: objectClass\n" +
-            "m-name: object\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCNameMany, ou=\n" +
+                " schema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-name: oc\n" +
+                "m-name: objectClass\n" +
+                "m-name: object\n\n";
 
         assertEquals( expected, transform( "testOCNameMany" ) );
     }
 
+
     @Test
     public void testConvertOCObsolete() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCObsolete, ou=\n" +
-            " schema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-obsolete: TRUE\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCObsolete, ou=\n" +
+                " schema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-obsolete: TRUE\n\n";
 
         assertEquals( expected, transform( "testOCObsolete" ) );
     }
 
+
     @Test
     public void testConvertOCSupOne() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCSupOne, ou=sc\n" +
-            " hema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-supObjectClass: top\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCSupOne, ou=sc\n" +
+                " hema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-supObjectClass: top\n\n";
 
         assertEquals( expected, transform( "testOCSupOne" ) );
     }
 
+
     @Test
     public void testConvertOCSup2() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCSup2, ou=sche\n" +
-            " ma\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-supObjectClass: top\n" +
-            "m-supObjectClass: 1.3.6.1.4.1.18060.0.4.2.3.15\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCSup2, ou=sche\n" +
+                " ma\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-supObjectClass: top\n" +
+                "m-supObjectClass: 1.3.6.1.4.1.18060.0.4.2.3.15\n\n";
 
         assertEquals( expected, transform( "testOCSup2" ) );
     }
 
+
     @Test
     public void testConvertOCSupMany() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCSupMany, ou=s\n" +
-            " chema\n" +
-            "objectclass: metaObjectClass\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-supObjectClass: top\n" +
-            "m-supObjectClass: 1.3.6.1.4.1.18060.0.4.2.3.15\n" +
-            "m-supObjectClass: metaTop\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=objectclasses, cn=testOCSupMany, ou=s\n" +
+                " chema\n" +
+                "objectclass: metaObjectClass\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-supObjectClass: top\n" +
+                "m-supObjectClass: 1.3.6.1.4.1.18060.0.4.2.3.15\n" +
+                "m-supObjectClass: metaTop\n\n";
 
         assertEquals( expected, transform( "testOCSupMany" ) );
     }
-    
+
+
     //-------------------------------------------------------------------------
     // Tests for Attributetype
     //-------------------------------------------------------------------------
@@ -417,404 +439,428 @@ public class TestSchemaToLdif
     public void testConvertATMinimal() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATMinimal, ou=\n" +
-            " schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATMinimal, ou=\n" +
+                " schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n\n";
 
         assertEquals( expected, transform( "testATMinimal" ) );
     }
-    
+
+
     @Test
     public void testConvertATNoName() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATNoName, ou=s\n" +
-            " chema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATNoName, ou=s\n" +
+                " chema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n\n";
 
         assertEquals( expected, transform( "testATNoName" ) );
     }
 
+
     @Test
     public void testConvertATNameOne() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATNameOne, ou=\n" +
-            " schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-name: attribute\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATNameOne, ou=\n" +
+                " schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-name: attribute\n\n";
 
         assertEquals( expected, transform( "testATNameOne" ) );
     }
 
+
     @Test
     public void testConvertATName2() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATName2, ou=sc\n" +
-            " hema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-name: at\n" +
-            "m-name: attribute\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATName2, ou=sc\n" +
+                " hema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-name: at\n" +
+                "m-name: attribute\n\n";
 
         assertEquals( expected, transform( "testATName2" ) );
     }
 
+
     @Test
     public void testConvertATNameMany() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATNameMany, ou\n" +
-            " =schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-name: at\n" +
-            "m-name: attribute\n" +
-            "m-name: attribute2\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATNameMany, ou\n" +
+                " =schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-name: at\n" +
+                "m-name: attribute\n" +
+                "m-name: attribute2\n\n";
 
         assertEquals( expected, transform( "testATNameMany" ) );
     }
 
+
     @Test
     public void testConvertATDesc() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATDesc, ou=sch\n" +
-            " ema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-description: An attributeType\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATDesc, ou=sch\n" +
+                " ema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-description: An attributeType\n\n";
 
         assertEquals( expected, transform( "testATDesc" ) );
     }
 
+
     @Test
     public void testConvertATObsolete() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATObsolete, ou\n" +
-            " =schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-obsolete: TRUE\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATObsolete, ou\n" +
+                " =schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-obsolete: TRUE\n\n";
 
         assertEquals( expected, transform( "testATObsolete" ) );
     }
 
+
     @Test
     public void testConvertATSup() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATSup, ou=sche\n" +
-            " ma\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-supAttributeType: anotherAttribute\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATSup, ou=sche\n" +
+                " ma\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-supAttributeType: anotherAttribute\n\n";
 
         assertEquals( expected, transform( "testATSup" ) );
     }
 
+
     @Test
     public void testConvertATSupOID() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATSupOID, ou=s\n" +
-            " chema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-supAttributeType: 1.3.6.1.4.1.18060.0.4.2.3.15\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATSupOID, ou=s\n" +
+                " chema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-supAttributeType: 1.3.6.1.4.1.18060.0.4.2.3.15\n\n";
 
         assertEquals( expected, transform( "testATSupOID" ) );
     }
 
+
     @Test
     public void testConvertATEquality() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATEquality, ou\n" +
-            " =schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-equality: booleanMatch\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATEquality, ou\n" +
+                " =schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-equality: booleanMatch\n\n";
 
         assertEquals( expected, transform( "testATEquality" ) );
     }
 
+
     @Test
     public void testConvertATEqualityOID() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATEqualityOID,\n" +
-            "  ou=schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-equality: 1.3.6.1.4.1.18060.0.4.2.3.15\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATEqualityOID,\n" +
+                "  ou=schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-equality: 1.3.6.1.4.1.18060.0.4.2.3.15\n\n";
 
         assertEquals( expected, transform( "testATEqualityOID" ) );
     }
 
+
     @Test
     public void testConvertATOrdering() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATOrdering, ou\n" +
-            " =schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-ordering: booleanMatch\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATOrdering, ou\n" +
+                " =schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-ordering: booleanMatch\n\n";
 
         assertEquals( expected, transform( "testATOrdering" ) );
     }
 
+
     @Test
     public void testConvertATOrderingOID() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATOrderingOID,\n" +
-            "  ou=schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-ordering: 1.3.6.1.4.1.18060.0.4.2.3.15\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATOrderingOID,\n" +
+                "  ou=schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-ordering: 1.3.6.1.4.1.18060.0.4.2.3.15\n\n";
 
         assertEquals( expected, transform( "testATOrderingOID" ) );
     }
 
+
     @Test
     public void testConvertATSubstr() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATSubstr, ou=s\n" +
-            " chema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-substr: booleanMatch\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATSubstr, ou=s\n" +
+                " chema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-substr: booleanMatch\n\n";
 
         assertEquals( expected, transform( "testATSubstr" ) );
     }
 
+
     @Test
     public void testConvertATSubstrOID() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATSubstrOID, o\n" +
-            " u=schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-substr: 1.3.6.1.4.1.18060.0.4.2.3.15\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATSubstrOID, o\n" +
+                " u=schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-substr: 1.3.6.1.4.1.18060.0.4.2.3.15\n\n";
 
         assertEquals( expected, transform( "testATSubstrOID" ) );
     }
 
+
     @Test
     public void testConvertATSyntax() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATSyntax, ou=s\n" +
-            " chema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-syntax: 1.3.6.1.4.1.18060.0.4.2.3.15\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATSyntax, ou=s\n" +
+                " chema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-syntax: 1.3.6.1.4.1.18060.0.4.2.3.15\n\n";
 
         assertEquals( expected, transform( "testATSyntax" ) );
     }
 
+
     @Test
     public void testConvertATSyntaxOidLen() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATSyntaxOidLen\n" +
-            " , ou=schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-syntax: 1.3.6.1.4.1.18060.0.4.2.3.15\n" +
-            "m-length: 123\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATSyntaxOidLen\n" +
+                " , ou=schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-syntax: 1.3.6.1.4.1.18060.0.4.2.3.15\n" +
+                "m-length: 123\n\n";
 
         assertEquals( expected, transform( "testATSyntaxOidLen" ) );
     }
 
+
     @Test
     public void testConvertATSingleValue() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATSingleValue,\n" +
-            "  ou=schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-singleValue: TRUE\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATSingleValue,\n" +
+                "  ou=schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-singleValue: TRUE\n\n";
 
         assertEquals( expected, transform( "testATSingleValue" ) );
     }
 
+
     @Test
     public void testConvertATCollective() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATCollective, \n" +
-            " ou=schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-collective: TRUE\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATCollective, \n" +
+                " ou=schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-collective: TRUE\n\n";
 
         assertEquals( expected, transform( "testATCollective" ) );
     }
 
+
     @Test
     public void testConvertATNoUserModification() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATNoUserModifi\n" +
-            " cation, ou=schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-noUserModification: TRUE\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATNoUserModifi\n" +
+                " cation, ou=schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-noUserModification: TRUE\n\n";
 
         assertEquals( expected, transform( "testATNoUserModification" ) );
     }
 
+
     @Test
     public void testConvertATUsageUserApp() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATUsageUserApp\n" +
-            " , ou=schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATUsageUserApp\n" +
+                " , ou=schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n\n";
 
         assertEquals( expected, transform( "testATUsageUserApp" ) );
     }
 
+
     @Test
     public void testConvertATUsageDirOp() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATUsageDirOp, \n" +
-            " ou=schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-usage: directoryOperation\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATUsageDirOp, \n" +
+                " ou=schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-usage: directoryOperation\n\n";
 
         assertEquals( expected, transform( "testATUsageDirOp" ) );
     }
 
+
     @Test
     public void testConvertATUsageDistrOp() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATUsageDistrOp\n" +
-            " , ou=schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-usage: distributedOperation\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATUsageDistrOp\n" +
+                " , ou=schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-usage: distributedOperation\n\n";
 
         assertEquals( expected, transform( "testATUsageDistrOp" ) );
     }
 
+
     @Test
     public void testConvertATUsageDSAOp() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATUsageDsaOp, \n" +
-            " ou=schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
-            "m-usage: dSAOperation\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.18060.0.4.2.3.14, ou=attributetypes, cn=testATUsageDsaOp, \n" +
+                " ou=schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.18060.0.4.2.3.14\n" +
+                "m-usage: dSAOperation\n\n";
 
         assertEquals( expected, transform( "testATUsageDsaOp" ) );
     }
 
+
     @Test
     public void testConvertMozillaATWithOidLen() throws ParserException, IOException
     {
         String expected =
-            HEADER + 
-            "dn: m-oid=1.3.6.1.4.1.13769.3.2, ou=attributetypes, cn=testMozillaATWithOidLen, \n" +
-            " ou=schema\n" +
-            "objectclass: metaAttributeType\n" +
-            "objectclass: metaTop\n" +
-            "objectclass: top\n" +
-            "m-oid: 1.3.6.1.4.1.13769.3.2\n" +
-            "m-name: mozillaHomeStreet2\n" +
-            "m-equality: caseIgnoreMatch\n" +
-            "m-substr: caseIgnoreSubstringsMatch\n" +
-            "m-syntax: 1.3.6.1.4.1.1466.115.121.1.15\n" +
-            "m-length: 128\n" +
-            "m-singleValue: TRUE\n\n";
+            HEADER +
+                "dn: m-oid=1.3.6.1.4.1.13769.3.2, ou=attributetypes, cn=testMozillaATWithOidLen, \n" +
+                " ou=schema\n" +
+                "objectclass: metaAttributeType\n" +
+                "objectclass: metaTop\n" +
+                "objectclass: top\n" +
+                "m-oid: 1.3.6.1.4.1.13769.3.2\n" +
+                "m-name: mozillaHomeStreet2\n" +
+                "m-equality: caseIgnoreMatch\n" +
+                "m-substr: caseIgnoreSubstringsMatch\n" +
+                "m-syntax: 1.3.6.1.4.1.1466.115.121.1.15\n" +
+                "m-length: 128\n" +
+                "m-singleValue: TRUE\n\n";
 
         assertEquals( expected, transform( "testMozillaATWithOidLen" ) );
     }

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaextractor/SchemaLdifExtractor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaextractor/SchemaLdifExtractor.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaextractor/SchemaLdifExtractor.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaextractor/SchemaLdifExtractor.java Tue Jan 24 17:44:03 2012
@@ -38,7 +38,7 @@ public interface SchemaLdifExtractor
      */
     boolean isExtracted();
 
-    
+
     /**
      * Extracts the LDIF files from a Jar file or copies exploded LDIF resources.
      *
@@ -47,7 +47,7 @@ public interface SchemaLdifExtractor
      */
     void extractOrCopy( boolean overwrite ) throws IOException;
 
-    
+
     /**
      * Extracts the LDIF files from a Jar file or copies exploded LDIF
      * resources without overwriting the resources if the schema has

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaextractor/UniqueResourceException.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaextractor/UniqueResourceException.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaextractor/UniqueResourceException.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaextractor/UniqueResourceException.java Tue Jan 24 17:44:03 2012
@@ -114,7 +114,7 @@ public class UniqueResourceException ext
         else
         {
             buf.append( "Multiple copies of resource named '" ).append( resourceName ).append(
-                    "' located on classpath at urls" );
+                "' located on classpath at urls" );
             for ( URL url : urls )
             {
                 buf.append( "\n    " ).append( url );

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaextractor/impl/ResourceMap.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaextractor/impl/ResourceMap.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaextractor/impl/ResourceMap.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaextractor/impl/ResourceMap.java Tue Jan 24 17:44:03 2012
@@ -208,7 +208,8 @@ public final class ResourceMap
         {
             ClassLoader cl = ResourceMap.class.getClassLoader();
             Enumeration<URL> indexes = cl.getResources( "META-INF/apacheds-schema.index" );
-            while(indexes.hasMoreElements()) {
+            while ( indexes.hasMoreElements() )
+            {
                 URL index = indexes.nextElement();
                 InputStream in = index.openStream();
                 BufferedReader reader = new BufferedReader( new InputStreamReader( in, "UTF-8" ) );

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/AttributeClassLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/AttributeClassLoader.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/AttributeClassLoader.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/AttributeClassLoader.java Tue Jan 24 17:44:03 2012
@@ -80,7 +80,7 @@ public class AttributeClassLoader extend
         {
             throw new ClassNotFoundException( I18n.err( I18n.ERR_10002 ) );
         }
-        
+
         classBytes = value.getBytes();
 
         return defineClass( name, classBytes, 0, classBytes.length );

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoader.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoader.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoader.java Tue Jan 24 17:44:03 2012
@@ -115,7 +115,7 @@ public class JarLdifSchemaLoader extends
         }
 
         Pattern pat = Pattern.compile( "schema" + SEPARATOR_PATTERN + "ou=schema"
-                + SEPARATOR_PATTERN + "cn=[a-z0-9-_]*\\." + LDIF_EXT );
+            + SEPARATOR_PATTERN + "cn=[a-z0-9-_]*\\." + LDIF_EXT );
 
         for ( String file : RESOURCE_MAP.keySet() )
         {
@@ -160,7 +160,7 @@ public class JarLdifSchemaLoader extends
     private String getSchemaDirectoryString( Schema schema )
     {
         return "schema" + "/" + "ou=schema" + "/"
-                        + "cn=" + Strings.lowerCase(schema.getSchemaName()) + "/";
+            + "cn=" + Strings.lowerCase( schema.getSchemaName() ) + "/";
     }
 
 
@@ -360,9 +360,9 @@ public class JarLdifSchemaLoader extends
         {
             // check that the attributeTypes directory exists for the schema
             String start = getSchemaDirectoryString( schema )
-                    + SchemaConstants.ATTRIBUTE_TYPES_PATH + "/" + "m-oid=";
+                + SchemaConstants.ATTRIBUTE_TYPES_PATH + "/" + "m-oid=";
             String end = "." + LDIF_EXT;
-            
+
             // get list of attributeType LDIF schema files in attributeTypes
             for ( String resourcePath : RESOURCE_MAP.keySet() )
             {

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/LdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/LdifSchemaLoader.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/LdifSchemaLoader.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/LdifSchemaLoader.java Tue Jan 24 17:44:03 2012
@@ -243,7 +243,8 @@ public class LdifSchemaLoader extends Ab
      */
     private File getSchemaDirectory( Schema schema )
     {
-        return new File( new File( baseDirectory, SchemaConstants.OU_SCHEMA ), "cn=" + Strings.lowerCase(schema.getSchemaName()) );
+        return new File( new File( baseDirectory, SchemaConstants.OU_SCHEMA ), "cn="
+            + Strings.lowerCase( schema.getSchemaName() ) );
     }
 
 

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java Tue Jan 24 17:44:03 2012
@@ -76,7 +76,7 @@ public class SchemaEntityFactory impleme
 
     /** The empty string list. */
     private static final List<String> EMPTY_LIST = new ArrayList<String>();
-    
+
     /** The empty string array. */
     private static final String[] EMPTY_ARRAY = new String[]
         {};
@@ -112,7 +112,7 @@ public class SchemaEntityFactory impleme
 
         String oid = mOid.getString();
 
-        if ( !Oid.isOid(oid) )
+        if ( !Oid.isOid( oid ) )
         {
             String msg = I18n.err( I18n.ERR_10006, oid );
             LOG.warn( msg );
@@ -184,7 +184,7 @@ public class SchemaEntityFactory impleme
      */
     private Schema getSchema( String schemaName, Registries registries )
     {
-        if ( Strings.isEmpty(schemaName) )
+        if ( Strings.isEmpty( schemaName ) )
         {
             schemaName = MetaSchemaConstants.SCHEMA_OTHER;
         }
@@ -257,7 +257,8 @@ public class SchemaEntityFactory impleme
     /**
      * Class load a syntaxChecker instance
      */
-    private SyntaxChecker classLoadSyntaxChecker( SchemaManager schemaManager, String oid, String className, Attribute byteCode )
+    private SyntaxChecker classLoadSyntaxChecker( SchemaManager schemaManager, String oid, String className,
+        Attribute byteCode )
         throws Exception
     {
         // Try to class load the syntaxChecker
@@ -273,7 +274,7 @@ public class SchemaEntityFactory impleme
         {
             classLoader.setAttribute( byteCode );
             clazz = classLoader.loadClass( className );
-            byteCodeStr = new String( Base64.encode(byteCode.getBytes()) );
+            byteCodeStr = new String( Base64.encode( byteCode.getBytes() ) );
         }
 
         // Create the syntaxChecker instance
@@ -288,7 +289,7 @@ public class SchemaEntityFactory impleme
 
         // Inject the SchemaManager for the comparator who needs it
         syntaxChecker.setSchemaManager( schemaManager );
-        
+
         return syntaxChecker;
     }
 
@@ -333,10 +334,10 @@ public class SchemaEntityFactory impleme
         {
             // Class load the syntaxChecker
             SyntaxChecker syntaxChecker = classLoadSyntaxChecker( schemaManager, oid, className, byteCode );
-    
+
             // Update the common fields
             setSchemaObjectProperties( syntaxChecker, entry, schema );
-    
+
             // return the resulting syntaxChecker
             return syntaxChecker;
         }
@@ -522,7 +523,7 @@ public class SchemaEntityFactory impleme
         {
             // Class load the comparator
             LdapComparator<?> comparator = classLoadComparator( schemaManager, oid, fqcn, byteCode );
-    
+
             // Update the common fields
             setSchemaObjectProperties( comparator, entry, schema );
 
@@ -653,10 +654,10 @@ public class SchemaEntityFactory impleme
         {
             // Class load the Normalizer
             Normalizer normalizer = classLoadNormalizer( schemaManager, oid, className, byteCode );
-    
+
             // Update the common fields
             setSchemaObjectProperties( normalizer, entry, schema );
-    
+
             // return the resulting Normalizer
             return normalizer;
         }
@@ -1027,7 +1028,7 @@ public class SchemaEntityFactory impleme
         return mFqcn;
     }
 
-    
+
     /**
      * Process the ByteCode attribute
      */

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SingleLdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SingleLdifSchemaLoader.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SingleLdifSchemaLoader.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SingleLdifSchemaLoader.java Tue Jan 24 17:44:03 2012
@@ -276,7 +276,7 @@ class SchemaMarker
 {
     /** The start marker. */
     private int start;
-    
+
     /** The end marker. */
     private int end;
 

Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Tue Jan 24 17:44:03 2012
@@ -722,7 +722,7 @@ public class DefaultSchemaManager implem
                         LOG.info( msg );
                         Throwable error = new LdapProtocolErrorException( msg );
                         errors.add( error );
-                        
+
                         return false;
                     }
 
@@ -1594,7 +1594,7 @@ public class DefaultSchemaManager implem
         return new ImmutableSyntaxCheckerRegistry( registries.getSyntaxCheckerRegistry() );
     }
 
-    
+
     /**
      * Get rid of AT's options (everything after the ';'
      * @param oid
@@ -1603,7 +1603,7 @@ public class DefaultSchemaManager implem
     private String stripOptions( String oid )
     {
         int semiColonPos = oid.indexOf( ';' );
-        
+
         if ( semiColonPos != -1 )
         {
             return oid.substring( 0, semiColonPos );
@@ -1614,6 +1614,7 @@ public class DefaultSchemaManager implem
         }
     }
 
+
     /**
      * {@inheritDoc}
      */

Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaextractor/impl/SchemaLdifExtractorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaextractor/impl/SchemaLdifExtractorTest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaextractor/impl/SchemaLdifExtractorTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaextractor/impl/SchemaLdifExtractorTest.java Tue Jan 24 17:44:03 2012
@@ -33,7 +33,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
- 
+
 /**
  * Tests the DefaultSchemaLdifExtractor class.
  *
@@ -45,7 +45,7 @@ public class SchemaLdifExtractorTest
 {
     private static String workingDirectory;
 
-    
+
     @BeforeClass
     public static void setup() throws IOException
     {
@@ -57,12 +57,12 @@ public class SchemaLdifExtractorTest
             int targetPos = path.indexOf( "target" );
             workingDirectory = path.substring( 0, targetPos + 6 );
         }
-        
+
         // Cleanup the target directory
         FileUtils.deleteDirectory( new File( workingDirectory + "/schema" ) );
     }
-    
-    
+
+
     @AfterClass
     public static void cleanup() throws IOException
     {
@@ -70,7 +70,7 @@ public class SchemaLdifExtractorTest
         FileUtils.deleteDirectory( new File( workingDirectory + "/schema" ) );
     }
 
-    
+
     @Test
     public void testExtract() throws Exception
     {

Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoaderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoaderTest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoaderTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/JarLdifSchemaLoaderTest.java Tue Jan 24 17:44:03 2012
@@ -47,10 +47,10 @@ public class JarLdifSchemaLoaderTest
         SchemaManager sm = new DefaultSchemaManager( loader );
 
         sm.loadWithDeps( "system" );
-        
+
         assertTrue( sm.getRegistries().getAttributeTypeRegistry().contains( "cn" ) );
         assertFalse( sm.getRegistries().getAttributeTypeRegistry().contains( "m-aux" ) );
-        
+
         sm.loadWithDeps( "apachemeta" );
 
         assertTrue( sm.getRegistries().getAttributeTypeRegistry().contains( "m-aux" ) );

Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/LdifSchemaLoaderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/LdifSchemaLoaderTest.java?rev=1235374&r1=1235373&r2=1235374&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/LdifSchemaLoaderTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/LdifSchemaLoaderTest.java Tue Jan 24 17:44:03 2012
@@ -51,7 +51,7 @@ public class LdifSchemaLoaderTest
 {
     private static String workingDirectory;
 
-    
+
     @BeforeClass
     public static void setup() throws IOException
     {
@@ -63,12 +63,12 @@ public class LdifSchemaLoaderTest
             int targetPos = path.indexOf( "target" );
             workingDirectory = path.substring( 0, targetPos + 6 );
         }
-        
+
         // Cleanup the target directory
         FileUtils.deleteDirectory( new File( workingDirectory + "/schema" ) );
     }
-    
-    
+
+
     @AfterClass
     public static void cleanup() throws IOException
     {
@@ -76,23 +76,23 @@ public class LdifSchemaLoaderTest
         FileUtils.deleteDirectory( new File( workingDirectory + "/schema" ) );
     }
 
-    
+
     @Test
     public void testLoader() throws Exception
     {
         SchemaLdifExtractor extractor = new DefaultSchemaLdifExtractor( new File( workingDirectory ) );
         extractor.extractOrCopy();
-        
+
         LdifSchemaLoader loader = new LdifSchemaLoader( new File( workingDirectory, "schema" ) );
         SchemaManager sm = new DefaultSchemaManager( loader );
 
         boolean loaded = sm.loadAllEnabled();
-        
+
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(sm.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( sm.getErrors() ) );
         }
-        
+
         assertTrue( sm.getRegistries().getAttributeTypeRegistry().contains( "cn" ) );
     }
 }



Mime
View raw message