directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erodrig...@apache.org
Subject svn commit: r541123 [24/25] - in /directory/apacheds/branches/apacheds-sasl-branch: ./ benchmarks/ bootstrap-extract/ bootstrap-extract/src/ bootstrap-extract/src/main/ bootstrap-extract/src/main/java/ bootstrap-extract/src/main/java/org/ bootstrap-ext...
Date Thu, 24 May 2007 00:27:07 GMT
Modified: directory/apacheds/branches/apacheds-sasl-branch/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxCheckerProducer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxCheckerProducer.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxCheckerProducer.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/schema-bootstrap/src/main/java/org/apache/directory/server/schema/bootstrap/SystemSyntaxCheckerProducer.java Wed May 23 17:26:40 2007
@@ -24,9 +24,63 @@
 
 import org.apache.directory.server.schema.bootstrap.ProducerTypeEnum;
 import org.apache.directory.server.schema.registries.Registries;
+import org.apache.directory.shared.ldap.schema.syntax.ACIItemSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.AcceptAllSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.AccessPointSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.AttributeTypeDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.AudioSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.BinarySyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.BitStringSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.BooleanSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.CertificateListSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.CertificatePairSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.CertificateSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.CountrySyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.DITContentRuleDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.DITStructureRuleDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.DLSubmitPermissionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.DNSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.DSAQualitySyntaxSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.DSETypeSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.DataQualitySyntaxSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.DeliveryMethodSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.DirectoryStringSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.EnhancedGuideSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.FacsimileTelephoneNumberSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.FaxSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.GeneralizedTimeSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.GuideSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.Ia5StringSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.IntegerSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.JpegSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.LdapSyntaxDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.MHSORAddressSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.MailPreferenceSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.MasterAndShadowAccessPointSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.MatchingRuleDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.MatchingRuleUseDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.NameAndOptionalUIDSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.NameFormDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.NumericStringSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.ObjectClassDescriptionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.OctetStringSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.OidSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.OtherMailboxSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.PostalAddressSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.PresentationAddressSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.PrintableStringSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.ProtocolInformationSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.SubstringAssertionSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.SubtreeSpecificationSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.SupplierAndConsumerSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.SupplierInformationSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.SupplierOrConsumerSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.SupportedAlgorithmSyntaxChecker;
 import org.apache.directory.shared.ldap.schema.syntax.SyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.TelephoneNumberSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.TeletexTerminalIdentifierSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.TelexNumberSyntaxChecker;
+import org.apache.directory.shared.ldap.schema.syntax.UtcTimeSyntaxChecker;
 
 
 /**
@@ -50,8 +104,6 @@
 
     public void produce( Registries registries, ProducerCallback cb ) throws NamingException
     {
-        SyntaxChecker syntaxChecker;
-
         /*
          * We are going to need a syntax checker for each and every one of
          * these syntaxes.  However right now we're probably not going to be
@@ -78,35 +130,16 @@
          * 8 Certificate List                 N  1.3.6.1.4.1.1466.115.121.1.9
          * 9 Certificate Pair                 N  1.3.6.1.4.1.1466.115.121.1.10
          */
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.1" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.2" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.3" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.4" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = BinarySyntaxChecker.INSTANCE;
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.6" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.7" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.8" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.9" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.10" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.1", new ACIItemSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.2", new AccessPointSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.3", new AttributeTypeDescriptionSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.4", new AudioSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.5", new BinarySyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.6", new BitStringSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.7", new BooleanSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.8", new CertificateSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.9", new CertificateListSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.10", new CertificatePairSyntaxChecker() );
 
         /*
          * 10 Country String                  Y  1.3.6.1.4.1.1466.115.121.1.11
@@ -120,35 +153,16 @@
          * 18 DSA Quality Syntax              Y  1.3.6.1.4.1.1466.115.121.1.19
          * 19 DSE Type                        Y  1.3.6.1.4.1.1466.115.121.1.20
          */
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.11" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.12" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.13" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.14" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.15" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.16" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.17" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.18" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.19" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.20" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.11", new CountrySyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.12", new DNSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.13", new DataQualitySyntaxSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.14", new DeliveryMethodSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.15", new DirectoryStringSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.16", new DITContentRuleDescriptionSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.17", new DITStructureRuleDescriptionSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.18", new DLSubmitPermissionSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.19", new DSAQualitySyntaxSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.20", new DSETypeSyntaxChecker() );
 
         /* 20 Enhanced Guide                  Y  1.3.6.1.4.1.1466.115.121.1.21
          * 21 Facsimile Telephone Number      Y  1.3.6.1.4.1.1466.115.121.1.22
@@ -161,35 +175,16 @@
          * 28 Master And Shadow Access Points Y  1.3.6.1.4.1.1466.115.121.1.29
          * 29 Matching Rule Description       Y  1.3.6.1.4.1.1466.115.121.1.30
          */
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.21" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.22" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.23" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.24" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.25" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.26" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.27" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.28" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.29" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.30" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.21", new EnhancedGuideSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.22", new FacsimileTelephoneNumberSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.23", new FaxSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.24", new GeneralizedTimeSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.25", new GuideSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.26", new Ia5StringSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.27", new IntegerSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.28", new JpegSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.29", new MasterAndShadowAccessPointSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.30", new MatchingRuleDescriptionSyntaxChecker() );
 
         /* 30 Matching Rule Use Description   Y  1.3.6.1.4.1.1466.115.121.1.31
          * 31 Mail Preference                 Y  1.3.6.1.4.1.1466.115.121.1.32
@@ -202,35 +197,16 @@
          * 38 Other Mailbox                   Y  1.3.6.1.4.1.1466.115.121.1.39
          * 39 Octet String                    Y  1.3.6.1.4.1.1466.115.121.1.40
          */
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.31" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.32" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.33" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.34" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.35" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.36" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.37" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.38" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.39" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.40" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.31", new MatchingRuleUseDescriptionSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.32", new MailPreferenceSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.33", new MHSORAddressSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.34", new NameAndOptionalUIDSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.35", new NameFormDescriptionSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.36", new NumericStringSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.37", new ObjectClassDescriptionSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.38", new OidSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.39", new OtherMailboxSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.40", new OctetStringSyntaxChecker() );
 
         /*
          * 40 Postal Address                  Y  1.3.6.1.4.1.1466.115.121.1.41
@@ -244,71 +220,44 @@
          * 48 Supported Algorithm             N  1.3.6.1.4.1.1466.115.121.1.49
          * 49 Telephone Number                Y  1.3.6.1.4.1.1466.115.121.1.50
          */
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.41" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.42" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.43" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.44" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.45" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.46" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.47" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.48" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.49" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.50" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.41", new PostalAddressSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.42", new ProtocolInformationSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.43", new PresentationAddressSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.44", new PrintableStringSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.45", new SubtreeSpecificationSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.46", new SupplierInformationSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.47", new SupplierOrConsumerSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.48", new SupplierAndConsumerSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.49", new SupportedAlgorithmSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.50", new TelephoneNumberSyntaxChecker() );
 
         /*
          * 50 Teletex Terminal Identifier     Y  1.3.6.1.4.1.1466.115.121.1.51
          * 51 Telex Number                    Y  1.3.6.1.4.1.1466.115.121.1.52
          * 52 UTC Time                        Y  1.3.6.1.4.1.1466.115.121.1.53
          * 53 LDAP Syntax Description         Y  1.3.6.1.4.1.1466.115.121.1.54
-         * 54 Modify Rights                   Y  1.3.6.1.4.1.1466.115.121.1.55
-         * 55 LDAP BootstrapSchema Definition Y  1.3.6.1.4.1.1466.115.121.1.56
-         * 56 LDAP BootstrapSchema Description Y  1.3.6.1.4.1.1466.115.121.1.57
+         * 54 Modify Rights                   Y  1.3.6.1.4.1.1466.115.121.1.55  (No defined SC yet)
+         * 55 LDAP BootstrapSchema Definition Y  1.3.6.1.4.1.1466.115.121.1.56  (No defined SC yet) 
+         * 56 LDAP BootstrapSchema DescriptionY  1.3.6.1.4.1.1466.115.121.1.57  (No defined SC yet)
          * 57 Substring Assertion             Y  1.3.6.1.4.1.1466.115.121.1.58
          */
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.51" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.52" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.53" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.54" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.51", new TeletexTerminalIdentifierSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.52", new TelexNumberSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.53", new UtcTimeSyntaxChecker() );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.54", new LdapSyntaxDescriptionSyntaxChecker() );
 
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.55" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.56" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.57" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
-
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.58" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.55", 
+            new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.55" ) );
         
-        syntaxChecker = new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.59" );
-        cb.schemaObjectProduced( this, syntaxChecker.getSyntaxOid(), syntaxChecker );
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.56", 
+            new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.56" ) );
+        
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.57", 
+            new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.57" ) );
+        
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.58", new SubstringAssertionSyntaxChecker() );
+
+        cb.schemaObjectProduced( this, "1.3.6.1.4.1.1466.115.121.1.59", 
+            new AcceptAllSyntaxChecker( "1.3.6.1.4.1.1466.115.121.1.59" ) );
     }
 }

Modified: directory/apacheds/branches/apacheds-sasl-branch/schema-bootstrap/src/main/schema/apache.schema
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/schema-bootstrap/src/main/schema/apache.schema?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/schema-bootstrap/src/main/schema/apache.schema (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/schema-bootstrap/src/main/schema/apache.schema Wed May 23 17:26:40 2007
@@ -104,19 +104,22 @@
     STRUCTURAL
     MUST prefNodeName )
 
-attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.12 NAME 'prescriptiveACI'
+#attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.12 NAME 'prescriptiveACI'
+attributetype ( 2.5.24.4 NAME 'prescriptiveACI'
   DESC 'Access control information that applies to a set of entries'
   EQUALITY directoryStringFirstComponentMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.1
   USAGE directoryOperation )
 
-attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.13 NAME 'entryACI'
+# was attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.13 NAME 'entryACI' ...
+attributetype ( 2.5.24.5 NAME 'entryACI'
   DESC 'Access control information that applies to a single entry'
   EQUALITY directoryStringFirstComponentMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.1
   USAGE directoryOperation )
 
-attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.14 NAME 'subentryACI'
+#attributetype ( 1.3.6.1.4.1.18060.0.4.1.2.14 NAME 'subentryACI'
+attributetype ( 2.5.24.6 NAME 'subentryACI'
   DESC 'Access control information that applies to a single subentry'
   EQUALITY directoryStringFirstComponentMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.1

Modified: directory/apacheds/branches/apacheds-sasl-branch/schema-bootstrap/src/main/schema/apachemeta.schema
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/schema-bootstrap/src/main/schema/apachemeta.schema?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/schema-bootstrap/src/main/schema/apachemeta.schema (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/schema-bootstrap/src/main/schema/apachemeta.schema Wed May 23 17:26:40 2007
@@ -70,9 +70,10 @@
 #         | 1.3.6.1.4.1.18060.0.4.0.2.31 | m-matchingRuleSyntax        |
 #         | 1.3.6.1.4.1.18060.0.4.0.2.32 | m-fqcn                      |
 #         | 1.3.6.1.4.1.18060.0.4.0.2.33 | m-bytecode                  |
-#         | 1.3.6.1.4.1.18060.0.4.0.2.34 | x-humanReadible             |
+#         | 1.3.6.1.4.1.18060.0.4.0.2.34 | x-humanReadable             |
 #         | 1.3.6.1.4.1.18060.0.4.0.2.37 | m-disabled                  |
 #         | 1.3.6.1.4.1.18060.0.4.0.2.38 | m-dependencies              |
+#         | 1.3.6.1.4.1.18060.0.4.0.2.39 | m-length                    |
 #         +------------------------------+-----------------------------+
 #
 #         +------------------------------+-----------------------------+
@@ -170,7 +171,7 @@
     STRUCTURAL
     MAY ( m-name $ m-obsolete $ m-supAttributeType $ m-equality $ m-ordering $ 
           m-substr $ m-syntax $ m-singleValue $ m-collective $
-          m-noUserModification $ m-usage )
+          m-noUserModification $ m-usage $ m-length )
 )
 
 # --- metaSyntax objectclass --------------------------------------------------
@@ -541,9 +542,9 @@
     SINGLE-VALUE
 )
 
-# --- x-humanReadible AttributeType ------------------------------------------------
-attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.34 NAME 'x-humanReadible'
-    DESC 'whether or not a syntax is human readible'
+# --- x-humanReadable AttributeType ------------------------------------------------
+attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.34 NAME 'x-humanReadable'
+    DESC 'whether or not a syntax is human readable'
     EQUALITY booleanMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
     SINGLE-VALUE
@@ -562,5 +563,13 @@
     DESC 'The dependencies of a schema: other schema names.'
     EQUALITY caseIgnoreMatch
     SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+)
+
+# --- m-length AttributeType -----------------------------------
+attributetype ( 1.3.6.1.4.1.18060.0.4.0.2.39 NAME 'm-length'
+    DESC 'The maximum length for an attribute value.'
+    EQUALITY caseIgnoreMatch
+    SYNTAX 1.3.6.1.4.1.18060.0.4.0.0.4
+    SINGLE-VALUE
 )
 

Modified: directory/apacheds/branches/apacheds-sasl-branch/schema-extras/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/schema-extras/pom.xml?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/schema-extras/pom.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/schema-extras/pom.xml Wed May 23 17:26:40 2007
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-schema-extras</artifactId>
   <name>ApacheDS Extra Schemas</name>

Modified: directory/apacheds/branches/apacheds-sasl-branch/schema-extras/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/schema-extras/src/main/resources/META-INF/NOTICE.txt?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/schema-extras/src/main/resources/META-INF/NOTICE.txt (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/schema-extras/src/main/resources/META-INF/NOTICE.txt Wed May 23 17:26:40 2007
@@ -3,3 +3,6 @@
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
+
+This product contains schema files forked from OpenLDAP
+(http://openldap.org)

Modified: directory/apacheds/branches/apacheds-sasl-branch/schema-registries/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/schema-registries/pom.xml?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/schema-registries/pom.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/schema-registries/pom.xml Wed May 23 17:26:40 2007
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-schema-registries</artifactId>
   <name>ApacheDS Schema Registries</name>

Modified: directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultAttributeTypeRegistry.java Wed May 23 17:26:40 2007
@@ -29,6 +29,7 @@
 
 import javax.naming.NamingException;
 
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
 import org.apache.directory.shared.ldap.schema.NoOpNormalizer;
@@ -49,6 +50,9 @@
     /** static class logger */
     private final static Logger log = LoggerFactory.getLogger( DefaultAttributeTypeRegistry.class );
 
+    /** Speedup for DEBUG mode */
+    private static final boolean IS_DEBUG = log.isDebugEnabled();
+    
     /** maps an OID to an AttributeType */
     private final Map<String,AttributeType> byOid;
     /** maps OIDs to a Set of descendants for that OID */
@@ -97,7 +101,8 @@
 
         registerDescendants( attributeType );
         byOid.put( attributeType.getOid(), attributeType );
-        if ( log.isDebugEnabled() )
+        
+        if ( IS_DEBUG )
         {
             log.debug( "registed attributeType: " + attributeType );
         }
@@ -130,7 +135,7 @@
             return;
         }
         
-        if ( ancestor.getName() != null && ancestor.getName().equals( "top" ) )
+        if ( ancestor.getName() != null && ancestor.getName().equals( SchemaConstants.TOP_OC ) )
         {
             return;
         }
@@ -157,10 +162,12 @@
         }
 
         AttributeType attributeType = ( AttributeType ) byOid.get( id );
-        if ( log.isDebugEnabled() )
+        
+        if ( IS_DEBUG )
         {
             log.debug( "lookup with id" + id + "' of attributeType: " + attributeType );
         }
+        
         return attributeType;
     }
 
@@ -216,7 +223,7 @@
                 
                 if ( matchingRule == null )
                 {
-                    log.warn( "Attribute " + type.getName() + " does not have normalizer : using NoopNormalizer" );
+                    log.debug( "Attribute " + type.getName() + " does not have normalizer : using NoopNormalizer" );
                     oidNormalizer = new OidNormalizer( type.getOid(), new NoOpNormalizer() );
                 }
                 else

Modified: directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultObjectClassRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultObjectClassRegistry.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultObjectClassRegistry.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultObjectClassRegistry.java Wed May 23 17:26:40 2007
@@ -41,6 +41,10 @@
 {
     /** static class logger */
     private final static Logger log = LoggerFactory.getLogger( DefaultObjectClassRegistry.class );
+    
+    /** Speedup for DEBUG mode */
+    private static final boolean IS_DEBUG = log.isDebugEnabled();
+    
     /** maps an OID to an ObjectClass */
     private final Map<String,ObjectClass> byOid;
     /** the registry used to resolve names to OIDs */
@@ -85,7 +89,8 @@
         }
         
         byOid.put( objectClass.getOid(), objectClass );
-        if ( log.isDebugEnabled() )
+        
+        if ( IS_DEBUG )
         {
             log.debug( "registered objectClass: " + objectClass );
         }
@@ -103,7 +108,8 @@
         }
 
         ObjectClass objectClass = ( ObjectClass ) byOid.get( id );
-        if ( log.isDebugEnabled() )
+        
+        if ( IS_DEBUG )
         {
             log.debug( "looked objectClass with OID '" + id + "' and got back " + objectClass );
         }

Modified: directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultOidRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultOidRegistry.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultOidRegistry.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultOidRegistry.java Wed May 23 17:26:40 2007
@@ -45,8 +45,13 @@
 {
     /** static class logger */
     private final static Logger log = LoggerFactory.getLogger( DefaultOidRegistry.class );
+    
+    /** Speedup for DEBUG mode */
+    private static final boolean IS_DEBUG = log.isDebugEnabled();
+    
     /** Maps OID to a name or a list of names if more than one name exists */
     private Map byOid = new HashMap();
+    
     /** Maps several names to an OID */
     private Map<String,String> byName = new HashMap<String,String>();
 
@@ -73,7 +78,8 @@
         if ( byName.containsKey( name ) )
         {
             String oid = ( String ) byName.get( name );
-            if ( log.isDebugEnabled() )
+            
+            if ( IS_DEBUG )
             {
                 log.debug( "looked up OID '" + oid + "' with id '" + name + "'" );
             }
@@ -91,7 +97,8 @@
         if ( !name.equals( lowerCase ) && byName.containsKey( lowerCase ) )
         {
             String oid = ( String ) byName.get( lowerCase );
-            if ( log.isDebugEnabled() )
+            
+            if ( IS_DEBUG )
             {
                 log.debug( "looked up OID '" + oid + "' with id '" + name + "'" );
             }
@@ -137,18 +144,21 @@
 
         if ( value instanceof String )
         {
-            if ( log.isDebugEnabled() )
+            if ( IS_DEBUG )
             {
                 log.debug( "looked up primary name '" + value + "' with OID '" + oid + "'" );
             }
+            
             return ( String ) value;
         }
 
         String name = ( String ) ( ( List ) value ).get( 0 );
-        if ( log.isDebugEnabled() )
+        
+        if ( IS_DEBUG )
         {
             log.debug( "looked up primary name '" + name + "' with OID '" + oid + "'" );
         }
+        
         return name;
     }
 
@@ -169,17 +179,20 @@
         if ( value instanceof String )
         {
             List list = Collections.singletonList( value );
-            if ( log.isDebugEnabled() )
+            
+            if ( IS_DEBUG )
             {
                 log.debug( "looked up names '" + list + "' for OID '" + oid + "'" );
             }
+            
             return list;
         }
 
-        if ( log.isDebugEnabled() )
+        if ( IS_DEBUG )
         {
             log.debug( "looked up names '" + value + "' for OID '" + oid + "'" );
         }
+        
         return ( List ) value;
     }
 
@@ -292,7 +305,8 @@
         }
 
         byOid.put( oid, value );
-        if ( log.isDebugEnabled() )
+        
+        if ( IS_DEBUG )
         {
             log.debug( "registed name '" + name + "' with OID: " + oid );
         }

Modified: directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java Wed May 23 17:26:40 2007
@@ -42,6 +42,10 @@
 {
     /** static class logger */
     private final static Logger log = LoggerFactory.getLogger( DefaultSyntaxRegistry.class );
+    
+    /** Speedup for DEBUG mode */
+    private static final boolean IS_DEBUG = log.isDebugEnabled();
+    
     /** a map of entries using an OID for the key and a Syntax for the value */
     private final Map<String,Syntax> byOid;
     /** the OID oidRegistry this oidRegistry uses to register new syntax OIDs */
@@ -74,10 +78,12 @@
         if ( byOid.containsKey( id ) )
         {
             Syntax syntax = ( Syntax ) byOid.get( id );
-            if ( log.isDebugEnabled() )
+            
+            if ( IS_DEBUG )
             {
                 log.debug( "looked up using id '" + id + "': " + syntax );
             }
+            
             return syntax;
         }
 
@@ -105,7 +111,8 @@
         }
 
         byOid.put( syntax.getOid(), syntax );
-        if ( log.isDebugEnabled() )
+        
+        if ( IS_DEBUG )
         {
             log.debug( "registered syntax: " + syntax );
         }

Modified: directory/apacheds/branches/apacheds-sasl-branch/server-installers/NOTICE.txt
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/server-installers/NOTICE.txt?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/server-installers/NOTICE.txt (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/server-installers/NOTICE.txt Wed May 23 17:26:40 2007
@@ -1,2 +1,32 @@
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
+Apache Directory Daemon
+Copyright 2007 The Apache Software Foundation
+
+This product includes software developed at 
+The Apache Software Foundation (http://www.apache.org/).
+
+This product uses JUnit (http://junit.org/).
+
+This product includes a distribution of NLOG4J 
+(http://www.slf4j.org/nlog4j/).
+
+This product includes a distribution of Antlr 2
+(http://antlr.org).
+
+This product includes a distribution of JDBM
+(http://jdbm.sourceforge.net).
+
+This product includes forked classes from the Legion of the Bouncy Castle
+(http://www.bouncycastle.org).
+
+This product includes a distribution of Spring Framework 
+(http://www.springframework.org).
+
+This product includes a distribution of Izpack Installer
+(http://www.izforge.com/izpack/).
+
+This product includes a distribution of Inno Setup Installer
+(http://www.jrsoftware.org/isinfo.php).
+
+This product includes derivatives of forked schema files from OpenLDAP
+(http://openldap.org)
+

Modified: directory/apacheds/branches/apacheds-sasl-branch/server-installers/README.txt
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/server-installers/README.txt?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/server-installers/README.txt (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/server-installers/README.txt Wed May 23 17:26:40 2007
@@ -4,14 +4,9 @@
 Documentation
 -------------
 
-All installer based distributions include a copy of the site documentation 
-within the docs directory.  Point your browser to:
+Go online for the most up to date documentation. Point your browser to:
 
-    ./docs/index.html
-
-or go online here for the most up to date documentation,
-
-     http://directory.apache.org/subprojects/apacheds/index.html
+     http://directory.apache.org/apacheds/1.5
 
 
 Running
@@ -29,7 +24,7 @@
 daemon mode the proper DISPLAY parameter must be set to launch the diagnostics
 on startup.
 
-On windows the server can be started like any other service using the services
+On Windows the server can be started like any other service using the services
 console via Microsoft Management Console.  It can also be started, stopped and
 configured using the procrun service manager installed for it: see 
 Start->All Programs->apacheds->Service Setttings. A tray icon can also be 
@@ -61,6 +56,9 @@
    graceful         starts graceful shutdown with shutdown delay & timeoffline
    diagnostic       launches diagnostic UI for inspecting server partitions
                     and client sessions
+   import           imports data to the server from a LDIF file
+   export           exports data from the server as a LDIF file 
+   proc             executes a Stored Procedure Command
 
 Over time this tool will include clients to add, delete, compare, modify and
 rename entries as well as search the directory.
@@ -69,27 +67,7 @@
 Connecting
 ----------
 
-See http://directory.apache.org/subprojects/apacheds/users/authentication.html
-or the bundled documentation.
-
-
-Building Bundled Sources
-------------------------
-
-The sources are bundled with the installers and can be found in the src
-directory of the installation base.  The build system used is Maven 2.  We use
-version 2.0.2 for this release.  In general we try to use the most recent 
-production release of Maven.  You can build the server like so:
-
-   cd ${install.basedir}; cd src; mvn install 
-
-If you're interested in the latest sources you can check out ApacheDS using 
-subversion at the following base URL:
-
-   http://svn.apache.org/repos/asf/directory/trunks
-
-We recommend issuing a build command at the top most level in case ApacheDS
-has dependencies on the latest MINA version in trunks.  
+See http://directory.apache.org/apacheds/1.5/apacheds-v15-basic-users-guide.html
 
 
 Notes
@@ -105,7 +83,7 @@
 
 Please direct all issues to users@directory.apache.org or file a JIRA here:
 
-   http://issues.apache.org/jira/DIRSERVER
+   http://issues.apache.org/jira/browse/DIRSERVER
 
 
 Thanks and enjoy,

Modified: directory/apacheds/branches/apacheds-sasl-branch/server-installers/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/server-installers/pom.xml?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/server-installers/pom.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/server-installers/pom.xml Wed May 23 17:26:40 2007
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.5.1-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-server-installers</artifactId>
   <name>ApacheDS Server Installers</name>
@@ -85,7 +85,7 @@
             <exclude>ant:ant</exclude>
             <exclude>aopalliance:aopalliance</exclude>
             <exclude>xerces:xerces</exclude>
-            <exclude>commons-pool:commons-pool</exclude>
+            <!--exclude>commons-pool:commons-pool</exclude-->
             <exclude>xml-apis:xml-apis</exclude>
             <exclude>aspectwerkz:aspectwerkz-core</exclude>
             <exclude>velocity:velocity</exclude>
@@ -105,19 +105,23 @@
           <application>
             <name>apacheds</name>
             <version>${pom.version}</version>
-            <copyrightYear>2006</copyrightYear>
-            <minimumJavaVersion>1.4</minimumJavaVersion>
-            <url>http://directory.apache.org/subprojects/apacheds</url>
+            <copyrightYear>2007</copyrightYear>
+            <minimumJavaVersion>1.5</minimumJavaVersion>
+            <url>http://directory.apache.org</url>
             <email>users@directory.apache.org</email>
             <description>Apache Directory Server</description>
             <authors>
               <author>Apache Directory Team</author>
               <author>akarasulu@apache.org</author>
+              <author>ckoppelt@apache.org</author>
               <author>elecharny@apache.org</author>
-              <author>ersiner@apache.org</author>
-              <author>trustin@apache.org</author>
               <author>erodriguez@apache.org</author>
+              <author>ersiner@apache.org</author>
+              <author>oersoy@apache.org</author>
+              <author>pamarcelot@apache.org</author>
               <author>szoerner@apache.org</author>
+              <author>seelmann@apache.org</author>
+              <author>trustin@apache.org</author>
             </authors>
           </application>
           <packagedFiles>
@@ -193,6 +197,26 @@
               <osName>Linux</osName>
               <osFamily>unix</osFamily>
               <osArch>i386</osArch>
+              <daemonFramework>jsvc</daemonFramework>
+            </izPackTarget>
+            <izPackTarget>
+              <packagedFiles>
+                <packagedFile>
+                  <source>izpack-apacheds-tools.sh</source>
+                  <destinationPath>bin/apacheds-tools.sh</destinationPath>
+                  <installationBundleId>Binaries</installationBundleId>
+                  <executable>true</executable>
+                  <filtered>true</filtered>
+                </packagedFile>
+              </packagedFiles>
+              <id>linux-jsvc-x86_64</id>
+              <izPackInstallFile>src/main/installers/izpack-unix.xml</izPackInstallFile>
+              <finalName>
+                apacheds-${pom.version}-linux-x86_64-setup.jar
+              </finalName>
+              <osName>Linux</osName>
+              <osFamily>unix</osFamily>
+              <osArch>x86_64</osArch>
               <daemonFramework>jsvc</daemonFramework>
             </izPackTarget>
 <!--

Modified: directory/apacheds/branches/apacheds-sasl-branch/server-installers/src/main/installers/server.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/server-installers/src/main/installers/server.xml?view=diff&rev=541123&r1=541122&r2=541123
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/server-installers/src/main/installers/server.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/server-installers/src/main/installers/server.xml Wed May 23 17:26:40 2007
@@ -1,368 +1,374 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
-  "http://www.springframework.org/dtd/spring-beans.dtd">
-
-<beans>
-  <bean id="environment" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
-    <property name="properties">
-      <props>
-        <prop key="java.naming.security.authentication">simple</prop>
-        <prop key="java.naming.security.principal">uid=admin,ou=system</prop>
-        <prop key="java.naming.security.credentials">secret</prop>
-        <!--<prop key="kdc.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
-        <!--<prop key="kdc.java.naming.security.credentials">secret</prop>-->
-        <!--<prop key="changepw.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
-        <!--<prop key="changepw.java.naming.security.credentials">secret</prop>-->
-        <!-- Set this key to a space delimited set of attributeType descriptions
-             and their OID's if you want an attributeType to be handled as 
-             binary content.
- 
-             The server will use the schema to derive the set of attributeTypes
-             to treat as binary.  The union if the values you provide here 
-             will be taken as the set of binaries. Note to be consistent you 
-             must add both the OID and all the names an attributeType can have.
-        -->
-        <!-- 
-        <prop key="java.naming.ldap.attributes.binary"></prop>
-        -->
-      </props>
-    </property>
-  </bean>
-  
-  <bean id="configuration" class="org.apache.directory.server.configuration.MutableServerStartupConfiguration">
-    <property name="workingDirectory" value="example.com" />
-
-    <!-- Uncomment below to have the server load entries on startup!        -->
-    <!-- ldifDirectory property can point to a relative file, directory or  -->
-    <!-- can point to an absolute path to either using the URL path         -->
-    <!-- notation: i.e. file:///Users/jack/apacheds/ldifs                   -->
-
-    <!-- Entries will optionally be filtered using LdifLoadFilters in the   -->
-    <!-- order specified.  The included Krb5KdcEntryFilter will filter      -->
-    <!-- kerberos principals creating keys for them using their             -->
-    <!-- userPassword attribute if present.                                 -->
-
-    <!--<property name="ldifDirectory">
-      <value>example.ldif</value>
-    </property>
-    <property name="ldifFilters">
-      <list>
-        <bean class="org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter"/>
-      </list>
-    </property>-->
-
-    <!-- the number of milliseconds before issuing a synch (flush to disk)  -->
-    <!-- which writes out dirty pages back to disk.  To turn off synchs all -->
-    <!-- together simply set this value to <= 0.  Make sure you turn on     -->
-    <!-- synchOnWrite for all partitions if you do choose to do this or else-->
-    <!-- writes may never persist to disk.                                  -->
-    <property name="synchPeriodMillis" value="15000" />
-
-    <!-- limits searches by non-admin users to a max time of 15000          -->
-    <!-- milliseconds and has a default value of 10000                      -->
-    <property name="maxTimeLimit" value="15000" />
-    <!-- limits searches to max size of 1000 entries: default value is 100  -->
-    <property name="maxSizeLimit" value="1000" />
-    <!-- maximum number of threads used by mina is set to 8: default is 4   -->
-    <property name="maxThreads" value="8" />
-
-    <property name="allowAnonymousAccess" value="false" />
-    <property name="accessControlEnabled" value="false" />
-    <property name="enableNtp" value="false" />
-    <property name="enableKerberos" value="false" />
-    <property name="enableChangePassword" value="false" />
-
-    <!--
-       It's more efficient to keep this feature turned off but you may not like
-       having the creatorsName and modifiersName contain OIDs instead of short
-       attributeType names instead.  So if you want the creatorsName to change
-       from the normalized form which is the internal representation of 
-           
-            '0.9.2342.19200300.100.1.1=admin,2.5.4.11=system'
-       
-       to a more human readabile form like:
-
-            'uid=admin,ou=system'
-
-       then set this property to true.
-    -->
-    <property name="denormalizeOpAttrsEnabled" value="false" />
-
-    <property name="ldapPort" value="10389" />
-
-    <property name="systemPartitionConfiguration" ref="systemPartitionConfiguration" />
-
-    <property name="partitionConfigurations">
-      <set>
-        <ref bean="examplePartitionConfiguration"/>
-      </set>
-    </property>
-    
-    <property name="extendedOperationHandlers">
-      <list>
-        <bean class="org.apache.directory.server.ldap.support.extended.GracefulShutdownHandler"/>
-        <bean class="org.apache.directory.server.ldap.support.extended.LaunchDiagnosticUiHandler"/>
-      </list>
-    </property>
-
-    <property name="interceptorConfigurations">
-      <list>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name" value="normalizationService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.normalization.NormalizationService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name" value="authenticationService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.authn.AuthenticationService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name" value="referralService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.referral.ReferralService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name" value="authorizationService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.authz.AuthorizationService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name" value="defaultAuthorizationService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.authz.DefaultAuthorizationService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name" value="exceptionService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.exception.ExceptionService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name" value="operationalAttributeService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.operational.OperationalAttributeService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name" value="schemaService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.schema.SchemaService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name" value="subentryService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.subtree.SubentryService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name" value="collectiveAttributeService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.collective.CollectiveAttributeService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name" value="eventService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.event.EventService" />
-          </property>
-        </bean>
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name" value="triggerService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.server.core.trigger.TriggerService" />
-          </property>
-        </bean>
-
-        <!-- Uncomment to enable replication service
-        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
-          <property name="name" value="replicationService" />
-          <property name="interceptor">
-            <bean class="org.apache.directory.mitosis.service.ReplicationService">
-              <property name="configuration">
-                <bean class="org.apache.directory.mitosis.configuration.ReplicationConfiguration">
-                  <property name="replicaId" value="instance_a" />
-                  <property name="serverPort" value="10390" />
-                  <property name="peerReplicas" value="instance_b@localhost:10392" />
-                </bean>
-              </property>
-            </bean>
-          </property>
-        </bean>
-        -->
-      </list>
-    </property>
-  </bean>
-  
-  <!-- use the following partitionConfiguration to override defaults for  -->
-  <!-- the system partition                                               --> 
-  <bean id="systemPartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
-    <property name="name" value="system" />
-    <property name="cacheSize" value="100" />
-    <property name="suffix" value="ou=system" />
-
-    <!-- the optimizer is enabled by default but may not always be what     -->
-    <!-- you want if your queries are really simple                         -->
-    <property name="optimizerEnabled" value="true" />
-
-    <!--
-      Synchronization on writes does not wait for synch operations
-      to flush dirty pages.  Writes persist immediately to disk at 
-      a cost to performance with increased data integrity.  Otherwise
-      the periodic synch operation will flush dirty pages using the
-      synchPeriodMillis parameter in the main configuration.
-    -->
-    <property name="synchOnWrite" value="true" />
-    <property name="indexedAttributes">
-      <set>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.1" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.2" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.3" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.4" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.5" />
-          <property name="cacheSize" value="10" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.6" />
-          <property name="cacheSize" value="10" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.7" />
-          <property name="cacheSize" value="10" />
-        </bean>
-
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="ou" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="uid" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="objectClass" />
-          <property name="cacheSize" value="100" />
-        </bean>
-      </set>
-    </property>
-    <property name="contextEntry">
-      <value>
-        objectClass: top
-        objectClass: organizationalUnit
-        objectClass: extensibleObject
-        ou: system
-      </value>
-    </property>
-  </bean>
-
-
-  <bean id="examplePartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
-    <property name="name" value="example" />
-    <property name="cacheSize" value="100" />
-    <property name="suffix" value="dc=example,dc=com" />
-
-    <!-- the optimizer is enabled by default but may not always be what     -->
-    <!-- you want if your queries are really simple                         -->
-    <property name="optimizerEnabled" value="true" />
-
-    <!--
-      Synchronization on writes does not wait for synch operations
-      to flush dirty pages.  Writes persist immediately to disk at 
-      a cost to performance with increased data integrity.  Otherwise
-      the periodic synch operation will flush dirty pages using the
-      synchPeriodMillis parameter in the main configuration.
-    -->
-    <property name="synchOnWrite" value="true" />
-    <property name="indexedAttributes">
-      <set>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.1" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.2" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.3" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.4" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.5" />
-          <property name="cacheSize" value="10" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.6" />
-          <property name="cacheSize" value="10" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.7" />
-          <property name="cacheSize" value="10" />
-        </bean>
-
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="dc" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="ou" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="krb5PrincipalName" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="uid" />
-          <property name="cacheSize" value="100" />
-        </bean>
-        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
-          <property name="attributeId" value="objectClass" />
-          <property name="cacheSize" value="100" />
-        </bean>
-      </set>
-    </property>
-    <property name="contextEntry">
-      <value>
-        objectClass: top
-        objectClass: domain
-        objectClass: extensibleObject
-        dc: example
-      </value>
-    </property>
-  </bean>
-
-  <bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
-    <property name="customEditors">
-      <map>
-        <entry key="javax.naming.directory.Attributes">
-          <bean class="org.apache.directory.server.core.configuration.AttributesPropertyEditor"/>
-        </entry>
-      </map>
-   </property>
-  </bean>
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
+  "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<beans>
+  <bean id="environment" class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+    <property name="properties">
+      <props>
+        <prop key="java.naming.security.authentication">simple</prop>
+        <prop key="java.naming.security.principal">uid=admin,ou=system</prop>
+        <prop key="java.naming.security.credentials">secret</prop>
+        <!--<prop key="kdc.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
+        <!--<prop key="kdc.java.naming.security.credentials">secret</prop>-->
+        <!--<prop key="changepw.entryBaseDn">ou=users,dc=example,dc=com</prop>-->
+        <!--<prop key="changepw.java.naming.security.credentials">secret</prop>-->
+        <!-- Set this key to a space delimited set of attributeType descriptions
+             and their OID's if you want an attributeType to be handled as 
+             binary content.
+ 
+             The server will use the schema to derive the set of attributeTypes
+             to treat as binary.  The union if the values you provide here 
+             will be taken as the set of binaries. Note to be consistent you 
+             must add both the OID and all the names an attributeType can have.
+        -->
+        <!-- 
+        <prop key="java.naming.ldap.attributes.binary"></prop>
+        -->
+      </props>
+    </property>
+  </bean>
+  
+  <bean id="configuration" class="org.apache.directory.server.configuration.MutableServerStartupConfiguration">
+    <property name="workingDirectory" value="example.com" />
+
+    <!-- Uncomment below to have the server load entries on startup!        -->
+    <!-- ldifDirectory property can point to a relative file, directory or  -->
+    <!-- can point to an absolute path to either using the URL path         -->
+    <!-- notation: i.e. file:///Users/jack/apacheds/ldifs                   -->
+
+    <!-- Entries will optionally be filtered using LdifLoadFilters in the   -->
+    <!-- order specified.  The included Krb5KdcEntryFilter will filter      -->
+    <!-- kerberos principals creating keys for them using their             -->
+    <!-- userPassword attribute if present.                                 -->
+
+    <!--<property name="ldifDirectory">
+      <value>example.ldif</value>
+    </property>
+    <property name="ldifFilters">
+      <list>
+        <bean class="org.apache.directory.server.protocol.shared.store.Krb5KdcEntryFilter"/>
+      </list>
+    </property>-->
+
+    <!-- the number of milliseconds before issuing a synch (flush to disk)  -->
+    <!-- which writes out dirty pages back to disk.  To turn off synchs all -->
+    <!-- together simply set this value to <= 0.  Make sure you turn on     -->
+    <!-- synchOnWrite for all partitions if you do choose to do this or else-->
+    <!-- writes may never persist to disk.                                  -->
+    <property name="synchPeriodMillis" value="15000" />
+
+    <!-- limits searches by non-admin users to a max time of 15000          -->
+    <!-- milliseconds and has a default value of 10000                      -->
+    <property name="maxTimeLimit" value="15000" />
+    <!-- limits searches to max size of 1000 entries: default value is 100  -->
+    <property name="maxSizeLimit" value="1000" />
+    <!-- maximum number of threads used by mina is set to 8: default is 4   -->
+    <property name="maxThreads" value="8" />
+
+    <property name="allowAnonymousAccess" value="false" />
+    <property name="accessControlEnabled" value="false" />
+    <property name="enableNtp" value="false" />
+    <property name="enableKerberos" value="false" />
+    <property name="enableChangePassword" value="false" />
+
+    <!--
+       It's more efficient to keep this feature turned off but you may not like
+       having the creatorsName and modifiersName contain OIDs instead of short
+       attributeType names instead.  So if you want the creatorsName to change
+       from the normalized form which is the internal representation of 
+           
+            '0.9.2342.19200300.100.1.1=admin,2.5.4.11=system'
+       
+       to a more human readabile form like:
+
+            'uid=admin,ou=system'
+
+       then set this property to true.
+    -->
+    <property name="denormalizeOpAttrsEnabled" value="false" />
+
+    <property name="ldapPort" value="10389" />
+
+    <property name="systemPartitionConfiguration" ref="systemPartitionConfiguration" />
+
+    <property name="partitionConfigurations">
+      <set>
+        <ref bean="examplePartitionConfiguration"/>
+      </set>
+    </property>
+    
+    <property name="extendedOperationHandlers">
+      <list>
+        <bean class="org.apache.directory.server.ldap.support.extended.GracefulShutdownHandler"/>
+        <bean class="org.apache.directory.server.ldap.support.extended.LaunchDiagnosticUiHandler"/>
+      </list>
+    </property>
+
+    <property name="interceptorConfigurations">
+      <list>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="normalizationService" />
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.normalization.NormalizationService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="authenticationService" />
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.authn.AuthenticationService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="referralService" />
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.referral.ReferralService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="authorizationService" />
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.authz.AuthorizationService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="defaultAuthorizationService" />
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.authz.DefaultAuthorizationService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="exceptionService" />
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.exception.ExceptionService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="operationalAttributeService" />
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.operational.OperationalAttributeService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="schemaService" />
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.schema.SchemaService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="subentryService" />
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.subtree.SubentryService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="collectiveAttributeService" />
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.collective.CollectiveAttributeService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="eventService" />
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.event.EventService" />
+          </property>
+        </bean>
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="triggerService" />
+          <property name="interceptor">
+            <bean class="org.apache.directory.server.core.trigger.TriggerService" />
+          </property>
+        </bean>
+
+        <!-- Uncomment to enable replication service
+        <bean class="org.apache.directory.server.core.configuration.MutableInterceptorConfiguration">
+          <property name="name" value="replicationService" />
+          <property name="interceptor">
+            <bean class="org.apache.directory.mitosis.service.ReplicationService">
+              <property name="configuration">
+                <bean class="org.apache.directory.mitosis.configuration.ReplicationConfiguration">
+                  <property name="replicaId">
+                    <bean class="org.apache.directory.mitosis.common.ReplicaId">
+                      <constructor-arg>
+                        <value>instance_a</value>
+                      </constructor-arg>
+                    </bean>
+                  </property>
+                  <property name="serverPort" value="10390" />
+                  <property name="peerReplicas" value="instance_b@localhost:10392" />
+                </bean>
+              </property>
+            </bean>
+          </property>
+        </bean>
+        -->
+      </list>
+    </property>
+  </bean>
+  
+  <!-- use the following partitionConfiguration to override defaults for  -->
+  <!-- the system partition                                               --> 
+  <bean id="systemPartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
+    <property name="name" value="system" />
+    <property name="cacheSize" value="100" />
+    <property name="suffix" value="ou=system" />
+
+    <!-- the optimizer is enabled by default but may not always be what     -->
+    <!-- you want if your queries are really simple                         -->
+    <property name="optimizerEnabled" value="true" />
+
+    <!--
+      Synchronization on writes does not wait for synch operations
+      to flush dirty pages.  Writes persist immediately to disk at 
+      a cost to performance with increased data integrity.  Otherwise
+      the periodic synch operation will flush dirty pages using the
+      synchPeriodMillis parameter in the main configuration.
+    -->
+    <property name="synchOnWrite" value="true" />
+    <property name="indexedAttributes">
+      <set>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.1" />
+          <property name="cacheSize" value="100" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.2" />
+          <property name="cacheSize" value="100" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.3" />
+          <property name="cacheSize" value="100" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.4" />
+          <property name="cacheSize" value="100" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.5" />
+          <property name="cacheSize" value="10" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.6" />
+          <property name="cacheSize" value="10" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.7" />
+          <property name="cacheSize" value="10" />
+        </bean>
+
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="ou" />
+          <property name="cacheSize" value="100" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="uid" />
+          <property name="cacheSize" value="100" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="objectClass" />
+          <property name="cacheSize" value="100" />
+        </bean>
+      </set>
+    </property>
+    <property name="contextEntry">
+      <value>
+        objectClass: top
+        objectClass: organizationalUnit
+        objectClass: extensibleObject
+        ou: system
+      </value>
+    </property>
+  </bean>
+
+
+  <bean id="examplePartitionConfiguration" class="org.apache.directory.server.core.partition.impl.btree.MutableBTreePartitionConfiguration">
+    <property name="name" value="example" />
+    <property name="cacheSize" value="100" />
+    <property name="suffix" value="dc=example,dc=com" />
+
+    <!-- the optimizer is enabled by default but may not always be what     -->
+    <!-- you want if your queries are really simple                         -->
+    <property name="optimizerEnabled" value="true" />
+
+    <!--
+      Synchronization on writes does not wait for synch operations
+      to flush dirty pages.  Writes persist immediately to disk at 
+      a cost to performance with increased data integrity.  Otherwise
+      the periodic synch operation will flush dirty pages using the
+      synchPeriodMillis parameter in the main configuration.
+    -->
+    <property name="synchOnWrite" value="true" />
+    <property name="indexedAttributes">
+      <set>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.1" />
+          <property name="cacheSize" value="100" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.2" />
+          <property name="cacheSize" value="100" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.3" />
+          <property name="cacheSize" value="100" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.4" />
+          <property name="cacheSize" value="100" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.5" />
+          <property name="cacheSize" value="10" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.6" />
+          <property name="cacheSize" value="10" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="1.3.6.1.4.1.18060.0.4.1.2.7" />
+          <property name="cacheSize" value="10" />
+        </bean>
+
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="dc" />
+          <property name="cacheSize" value="100" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="ou" />
+          <property name="cacheSize" value="100" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="krb5PrincipalName" />
+          <property name="cacheSize" value="100" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="uid" />
+          <property name="cacheSize" value="100" />
+        </bean>
+        <bean class="org.apache.directory.server.core.partition.impl.btree.MutableIndexConfiguration">
+          <property name="attributeId" value="objectClass" />
+          <property name="cacheSize" value="100" />
+        </bean>
+      </set>
+    </property>
+    <property name="contextEntry">
+      <value>
+        objectClass: top
+        objectClass: domain
+        objectClass: extensibleObject
+        dc: example
+      </value>
+    </property>
+  </bean>
+
+  <bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
+    <property name="customEditors">
+      <map>
+        <entry key="javax.naming.directory.Attributes">
+          <bean class="org.apache.directory.server.core.configuration.AttributesPropertyEditor"/>
+        </entry>
+      </map>
+   </property>
+  </bean>
+</beans>



Mime
View raw message