Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 76814E14A for ; Wed, 5 Dec 2012 14:28:11 +0000 (UTC) Received: (qmail 80143 invoked by uid 500); 5 Dec 2012 14:28:11 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 80062 invoked by uid 500); 5 Dec 2012 14:28:09 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 80011 invoked by uid 99); 5 Dec 2012 14:28:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Dec 2012 14:28:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Dec 2012 14:27:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2AEDA23888E7; Wed, 5 Dec 2012 14:27:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1417441 - in /directory: apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/ apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ apacheds/trunk/server-config/src/main/java/org/a... Date: Wed, 05 Dec 2012 14:27:33 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121205142735.2AEDA23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Wed Dec 5 14:27:30 2012 New Revision: 1417441 URL: http://svn.apache.org/viewvc?rev=1417441&view=rev Log: o made many attributes which are mandatory for the server to function as MUST o removed the composite configuration attributes like 'ads-partitions' and 'ads-servers' from the config.ldif (reader can work even without these values present in the parent entries) o renamed ads-dsMaxPDUSize to ads-maxPDUSize o moved maxPduSize variable from DirectoryService to LdapServer (this is a network related variable so LdapServer is the right place) (updated the config schema and configuration accordingly) o fixed the syntax in ads-certificatePassword attribute's definition o fixed the tests and removed the config tests related to unsupported Ntp, DNS and DHCP servers Removed: directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DhcpServerConfigReaderTest.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DnsServerConfigReaderTest.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/NtpServerConfigReaderTest.java directory/apacheds/trunk/server-config/src/test/resources/dhcpServer.ldif directory/apacheds/trunk/server-config/src/test/resources/dnsServer.ldif directory/apacheds/trunk/server-config/src/test/resources/ntpServer.ldif Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddIT.java directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java directory/apacheds/trunk/server-config/src/main/resources/config.ldif directory/apacheds/trunk/server-config/src/test/resources/changePasswordServer.ldif directory/apacheds/trunk/server-config/src/test/resources/httpServer.ldif directory/apacheds/trunk/server-config/src/test/resources/kerberosServer.ldif directory/apacheds/trunk/server-config/src/test/resources/ldapServer.ldif directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.110.ldif directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.309.ldif directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.100.ldif directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.120.ldif directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.140.ldif directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.18.ldif directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.803.ldif Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddIT.java?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddIT.java Wed Dec 5 14:27:30 2012 @@ -103,16 +103,18 @@ public class AddIT extends AbstractLdapT "ObjectClass: ads-directoryService", "ads-directoryServiceId: test", "ads-dsReplicaId: test", - "ads-interceptors: test", - "ads-partitions: test", - "ads-dsMaxPDUSize: 2147483648" + "ads-dsDenormalizeOpAttrsEnabled: TRUE", + "ads-dsAccessControlEnabled: TRUE", + "ads-dsAllowAnonymousAccess: TRUE", + "ads-dsPasswordHidden: TRUE", + "ads-dsSyncPeriodMillis: 2147483648" ); connection.add( entry ); entry = connection.lookup( dn ); - assertEquals( "2147483648", entry.get( "ads-dsMaxPDUSize" ).getString() ); + assertEquals( "2147483648", entry.get( "ads-dsSyncPeriodMillis" ).getString() ); getService().shutdown(); @@ -124,6 +126,6 @@ public class AddIT extends AbstractLdapT entry = connection.lookup( dn ); - assertEquals( "2147483648", entry.get( "ads-dsMaxPDUSize" ).getString() ); + assertEquals( "2147483648", entry.get( "ads-dsSyncPeriodMillis" ).getString() ); } } Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Wed Dec 5 14:27:30 2012 @@ -174,6 +174,9 @@ public class LdapServer extends Director */ private int maxTimeLimit = MAX_TIME_LIMIT_DEFAULT; + /** The maximum size for an incoming PDU */ + private int maxPDUSize = Integer.MAX_VALUE; + /** If LDAPS is activated : the external Keystore file, if defined */ private String keystoreFile; @@ -1648,8 +1651,33 @@ public class LdapServer extends Director { return keyManagerFactory; } + + + /** + * @return The maximum allowed size for an incoming PDU + */ + public int getMaxPDUSize() + { + return maxPDUSize; + } + + /** + * Set the maximum allowed size for an incoming PDU + * @param maxPDUSize A positive number of bytes for the PDU. A negative or + * null value will be transformed to {@link Integer#MAX_VALUE} + */ + public void setMaxPDUSize( int maxPDUSize ) + { + if ( maxPDUSize <= 0 ) + { + maxPDUSize = Integer.MAX_VALUE; + } + + this.maxPDUSize = maxPDUSize; + } + /** * @see Object#toString() */ Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java (original) +++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java Wed Dec 5 14:27:30 2012 @@ -54,10 +54,6 @@ public class DirectoryServiceBean extend @ConfigurationElement(attributeType = "ads-dsDenormalizeOpAttrsEnabled") private boolean dsDenormalizeOpAttrsEnabled = true; - /** The maximum size of an incoming PDU */ - @ConfigurationElement(attributeType = "ads-dsMaxPDUSize") - private int dsMaxPDUSize = 2048; - /** The flag that tells if the password should be returned as a normal attribute or not */ @ConfigurationElement(attributeType = "ads-dsPasswordHidden", isOptional = true, defaultValue = "false") private boolean dsPasswordHidden = false; @@ -234,24 +230,6 @@ public class DirectoryServiceBean extend /** - * @return the dsMaxPDUSize - */ - public int getDsMaxPDUSize() - { - return dsMaxPDUSize; - } - - - /** - * @param dsMaxPDUSize the dsMaxPDUSize to set - */ - public void setDsMaxPDUSize( int dsMaxPDUSize ) - { - this.dsMaxPDUSize = dsMaxPDUSize; - } - - - /** * @return the dsPasswordHidden */ public boolean isDsPasswordHidden() @@ -537,7 +515,6 @@ public class DirectoryServiceBean extend sb.append( toString( " ", "allow anonymous access", dsAllowAnonymousAccess ) ); sb.append( toString( " ", "denormalized attributes enabled", dsDenormalizeOpAttrsEnabled ) ); sb.append( toString( " ", "password hidden", dsPasswordHidden ) ); - sb.append( " max PDU size : " ).append( dsMaxPDUSize ).append( '\n' ); sb.append( " sync period millisecond : " ).append( dsSyncPeriodMillis ).append( '\n' ); sb.append( toString( " ", "test entries", dsTestEntries ) ); Modified: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java (original) +++ directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java Wed Dec 5 14:27:30 2012 @@ -46,6 +46,10 @@ public class LdapServerBean extends DSBa @ConfigurationElement(attributeType = "ads-maxTimeLimit") private int maxTimeLimit; + /** The maximum size of an incoming PDU */ + @ConfigurationElement(attributeType = "ads-maxPDUSize") + private int maxPDUSize = 2048; + /** The SASL host */ @ConfigurationElement(attributeType = "ads-saslHost") private String saslHost; @@ -361,6 +365,24 @@ public class LdapServerBean extends DSBa this.replConsumers.add( bean ); } } + + + /** + * @return the maxPDUSize + */ + public int getMaxPDUSize() + { + return maxPDUSize; + } + + + /** + * @param maxPDUSize the maxPDUSize to set + */ + public void setMaxPDUSize( int maxPDUSize ) + { + this.maxPDUSize = maxPDUSize; + } /** @@ -374,6 +396,7 @@ public class LdapServerBean extends DSBa sb.append( super.toString( tabs + " " ) ); sb.append( tabs ).append( " max size limit : " ).append( maxSizeLimit ).append( '\n' ); sb.append( tabs ).append( " max time limit : " ).append( maxTimeLimit ).append( '\n' ); + sb.append( " max PDU size : " ).append( maxPDUSize ).append( '\n' ); sb.append( toString( tabs, " certificate password", certificatePassword ) ); sb.append( toString( tabs, " keystore file", keystoreFile ) ); sb.append( toString( tabs, " sasl principal", saslPrincipal ) ); Modified: directory/apacheds/trunk/server-config/src/main/resources/config.ldif URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/resources/config.ldif?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/main/resources/config.ldif (original) +++ directory/apacheds/trunk/server-config/src/main/resources/config.ldif Wed Dec 5 14:27:30 2012 @@ -11,32 +11,10 @@ objectclass: ads-directoryService ads-directoryserviceid: default ads-dsreplicaid: 1 ads-dssyncperiodmillis: 15000 -ads-dsmaxpdusize: 2000000 +ads-dsPasswordHidden: FALSE ads-dsallowanonymousaccess: TRUE ads-dsaccesscontrolenabled: FALSE ads-dsdenormalizeopattrsenabled: FALSE -ads-servers: changePasswordServer -ads-servers: dnsServer -ads-servers: httpServer -ads-servers: kerberosServer -ads-servers: ldapServer -ads-servers: ntpServer -ads-partitions: example -ads-partitions: system -ads-interceptors: aciAuthorizationInterceptor -ads-interceptors: authenticationInterceptor -ads-interceptors: collectiveAttributeInterceptor -ads-interceptors: defaultAuthorizationInterceptor -ads-interceptors: eventInterceptor -ads-interceptors: exceptionInterceptor -ads-interceptors: keyDerivationInterceptor -ads-interceptors: normalizationInterceptor -ads-interceptors: operationalAttributeInterceptor -ads-interceptors: passwordHashingInterceptor -ads-interceptors: referralInterceptor -ads-interceptors: schemaInterceptor -ads-interceptors: subentryInterceptor -ads-interceptors: triggerInterceptor ads-enabled: TRUE dn: ads-changeLogId=defaultChangeLog,ads-directoryServiceId=default,ou=config @@ -78,10 +56,6 @@ ads-interceptororder: 2 ads-interceptorclassname: org.apache.directory.server.core.authn.AuthenticationInterceptor ads-interceptorid: authenticationInterceptor ads-enabled: TRUE -ads-passwordPolicies: default -ads-authenticators: anonymousauthenticator -ads-authenticators: simpleauthenticator -ads-authenticators: strongauthenticator dn: ou=authenticators,ads-interceptorId=authenticationInterceptor,ou=interceptors,ads-directoryServiceId=default,ou=config ou: authenticators @@ -136,7 +110,7 @@ ads-pwdExpireWarning: 600 ads-pwdMinAge: 0 ads-pwdAllowUserChange: TRUE ads-pwdGraceAuthNLimit: 5 -ads-pwdCheckQuality: 2 +ads-pwdCheckQuality: 1 ads-pwdMaxLength: 0 ads-pwdGraceExpire: 0 ads-pwdMinDelay: 0 @@ -262,18 +236,6 @@ objectclass: top objectClass: ads-base objectclass: ads-partition objectclass: ads-jdbmPartition -ads-indexes: apacheRdn -ads-indexes: apacheSubLevel -ads-indexes: apachePresence -ads-indexes: apacheOneLevel -ads-indexes: apacheOneAlias -ads-indexes: apacheSubAlias -ads-indexes: apacheAlias -ads-indexes: objectClass -ads-indexes: entryCSN -ads-indexes: ou -ads-indexes: uid -ads-indexes: administrativeRole ads-partitionSuffix: ou=system ads-jdbmpartitionoptimizerenabled: TRUE ads-partitioncachesize: 100 @@ -396,20 +358,6 @@ objectclass: top objectClass: ads-base objectclass: ads-partition objectclass: ads-jdbmPartition -ads-indexes: apacheRdn -ads-indexes: apacheSubLevel -ads-indexes: apachePresence -ads-indexes: apacheOneLevel -ads-indexes: apacheOneAlias -ads-indexes: apacheSubAlias -ads-indexes: apacheAlias -ads-indexes: entryCSN -ads-indexes: dc -ads-indexes: krb5PrincipalName -ads-indexes: objectClass -ads-indexes: ou -ads-indexes: uid -ads-indexes: administrativeRole ads-partitionSuffix: dc=example,dc=com ads-contextentry:: ZG46IGRjPWV4YW1wbGUsZGM9Y29tCmRjOiBleGFtcGxlCm9iamVjdGNsY XNzOiBkb21haW4Kb2JqZWN0Y2xhc3M6IHRvcAoK @@ -574,6 +522,7 @@ objectclass: top dn: ads-transportId=tcp,ou=transports,ads-serverId=changePasswordServer,ou=servers,ads-directoryServiceId=default,ou=config ads-systemport: 60464 ads-transportnbthreads: 2 +ads-transportaddress: 0.0.0.0 ads-transportid: tcp objectclass: ads-transport objectclass: ads-tcpTransport @@ -584,40 +533,7 @@ ads-enabled: TRUE dn: ads-transportId=udp,ou=transports,ads-serverId=changePasswordServer,ou=servers,ads-directoryServiceId=default,ou=config ads-systemport: 60464 ads-transportnbthreads: 2 -ads-transportid: udp -objectclass: ads-transport -objectclass: ads-udpTransport -objectClass: ads-base -objectclass: top -ads-enabled: TRUE - -dn: ads-serverId=dnsServer,ou=servers,ads-directoryServiceId=default,ou=config -ads-serverid: dnsServer -ads-enabled: FALSE -objectclass: ads-server -objectclass: ads-dnsServer -objectclass: ads-dsBasedServer -objectclass: ads-base -objectclass: top -ads-transports: tcp -ads-transports: udp - -dn: ou=transports,ads-serverId=dnsServer,ou=servers,ads-directoryServiceId=default,ou=config -ou: transports -objectclass: organizationalUnit -objectclass: top - -dn: ads-transportId=tcp,ou=transports,ads-serverId=dnsServer,ou=servers,ads-directoryServiceId=default,ou=config -ads-systemport: 8053 -ads-transportid: tcp -objectclass: ads-transport -objectclass: ads-tcpTransport -objectClass: ads-base -objectclass: top -ads-enabled: TRUE - -dn: ads-transportId=udp,ou=transports,ads-serverId=dnsServer,ou=servers,ads-directoryServiceId=default,ou=config -ads-systemport: 8053 +ads-transportaddress: 0.0.0.0 ads-transportid: udp objectclass: ads-transport objectclass: ads-udpTransport @@ -632,8 +548,6 @@ objectclass: ads-server objectclass: ads-httpServer objectclass: ads-base objectclass: top -ads-transports: http -ads-transports: https dn: ou=transports,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config ou: transports @@ -736,20 +650,13 @@ ads-serverId: ldapServer ads-confidentialityRequired: FALSE ads-maxSizeLimit: 1000 ads-maxTimeLimit: 15000 +ads-maxpdusize: 2000000 ads-saslHost: ldap.example.com ads-saslPrincipal: ldap/ldap.example.com@EXAMPLE.COM ads-saslRealms: example.com ads-saslRealms: apache.org ads-searchBaseDN: ou=users,ou=system ads-enabled: TRUE -ads-transports: ldap -ads-transports: ldaps -ads-saslmechhandlers: CRAM-MD5 -ads-saslmechhandlers: DIGEST-MD5 -ads-saslmechhandlers: GSS-SPNEGO -ads-saslmechhandlers: GSSAPI -ads-saslmechhandlers: NTLM -ads-saslmechhandlers: SIMPLE ads-extendedophandlers: gracefulShutdownHandler ads-extendedophandlers: starttlshandler ads-extendedophandlers: storedprochandler @@ -870,37 +777,3 @@ objectclass: ads-base objectclass: top ads-saslMechName: SIMPLE ads-enabled: TRUE - -dn: ads-serverId=ntpServer,ou=servers,ads-directoryServiceId=default,ou=config -ads-serverid: ntpServer -ads-enabled: FALSE -objectclass: ads-server -objectclass: ads-ntpServer -objectclass: ads-base -objectclass: top -ads-transports: tcp -ads-transports: udp - -dn: ou=transports,ads-serverId=ntpServer,ou=servers,ads-directoryServiceId=default,ou=config -ou: transports -objectclass: organizationalUnit -objectclass: top - -dn: ads-transportId=tcp,ou=transports,ads-serverId=ntpServer,ou=servers,ads-directoryServiceId=default,ou=config -ads-systemport: 60123 -ads-transportid: tcp -objectclass: ads-transport -objectclass: ads-tcpTransport -objectClass: ads-base -objectclass: top -ads-enabled: TRUE - -dn: ads-transportId=udp,ou=transports,ads-serverId=ntpServer,ou=servers,ads-directoryServiceId=default,ou=config -ads-systemport: 60123 -ads-transportnbthreads: 1 -ads-transportid: udp -objectclass: ads-transport -objectclass: ads-udpTransport -objectClass: ads-base -objectclass: top -ads-enabled: TRUE Modified: directory/apacheds/trunk/server-config/src/test/resources/changePasswordServer.ldif URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/resources/changePasswordServer.ldif?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/test/resources/changePasswordServer.ldif (original) +++ directory/apacheds/trunk/server-config/src/test/resources/changePasswordServer.ldif Wed Dec 5 14:27:30 2012 @@ -10,32 +10,9 @@ objectclass: ads-directoryService ads-directoryserviceid: default ads-dsreplicaid: 1 ads-dssyncperiodmillis: 15000 -ads-dsmaxpdusize: 2000000 ads-dsallowanonymousaccess: true ads-dsaccesscontrolenabled: false ads-dsdenormalizeopattrsenabled: false -ads-servers: changepasswordserver -ads-servers: dns -ads-servers: httpserver -ads-servers: kerberos -ads-servers: ldapserver -ads-servers: ntp -ads-partitions: example -ads-partitions: system -ads-interceptors: aciAuthorizationInterceptor -ads-interceptors: authenticationInterceptor -ads-interceptors: collectiveAttributeInterceptor -ads-interceptors: defaultAuthorizationInterceptor -ads-interceptors: eventInterceptor -ads-interceptors: exceptionInterceptor -ads-interceptors: keyderivationinterceptor -ads-interceptors: normalizationInterceptor -ads-interceptors: operationalAttributeInterceptor -ads-interceptors: passwordpolicyinterceptor -ads-interceptors: referralInterceptor -ads-interceptors: schemaInterceptor -ads-interceptors: subentryInterceptor -ads-interceptors: triggerInterceptor ads-enabled: true dn: ou=servers,ads-directoryServiceId=default,ou=config @@ -66,13 +43,13 @@ ou: transports objectclass: organizationalUnit objectclass: top -dn: ads-transportid=ldap1,ou=transports,ads-serverId=changePasswordServer,ou=servers,ads-directoryServiceId=default,ou=config +dn: ads-transportid=tcp,ou=transports,ads-serverId=changePasswordServer,ou=servers,ads-directoryServiceId=default,ou=config ads-systemport: 10389 ads-transportenablessl: false ads-transportbacklog: 50 ads-transportnbthreads: 8 ads-transportaddress: 0.0.0.0 -ads-transportid: ldap1 +ads-transportid: tcp objectclass: ads-transport objectclass: ads-tcpTransport objectclass: top Modified: directory/apacheds/trunk/server-config/src/test/resources/httpServer.ldif URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/resources/httpServer.ldif?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/test/resources/httpServer.ldif (original) +++ directory/apacheds/trunk/server-config/src/test/resources/httpServer.ldif Wed Dec 5 14:27:30 2012 @@ -11,32 +11,9 @@ objectclass: ads-directoryService ads-directoryserviceid: default ads-dsreplicaid: 1 ads-dssyncperiodmillis: 15000 -ads-dsmaxpdusize: 2000000 ads-dsallowanonymousaccess: true ads-dsaccesscontrolenabled: false ads-dsdenormalizeopattrsenabled: false -ads-servers: changepasswordserver -ads-servers: dns -ads-servers: httpserver -ads-servers: kerberos -ads-servers: ldapserver -ads-servers: ntp -ads-partitions: example -ads-partitions: system -ads-interceptors: aciAuthorizationInterceptor -ads-interceptors: authenticationInterceptor -ads-interceptors: collectiveAttributeInterceptor -ads-interceptors: defaultAuthorizationInterceptor -ads-interceptors: eventInterceptor -ads-interceptors: exceptionInterceptor -ads-interceptors: keyderivationinterceptor -ads-interceptors: normalizationInterceptor -ads-interceptors: operationalAttributeInterceptor -ads-interceptors: passwordpolicyinterceptor -ads-interceptors: referralInterceptor -ads-interceptors: schemaInterceptor -ads-interceptors: subentryInterceptor -ads-interceptors: triggerInterceptor ads-enabled: true dn: ou=servers,ads-directoryServiceId=default,ou=config @@ -79,12 +56,12 @@ ou: transports objectclass: organizationalUnit objectclass: top -dn: ads-transportid=http-tcp,ou=transports,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config +dn: ads-transportid=http,ou=transports,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config objectclass: top objectclass: ads-base objectclass: ads-transport objectclass: ads-tcpTransport -ads-transportid: ntp-http +ads-transportid: http ads-systemport: 123 ads-transportenablessl: false ads-transportbacklog: 50 @@ -92,12 +69,12 @@ ads-transportnbthreads: 8 ads-transportaddress: 0.0.0.0 ads-enabled: true -dn: ads-transportid=http-udp,ou=transports,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config +dn: ads-transportid=https,ou=transports,ads-serverId=httpServer,ou=servers,ads-directoryServiceId=default,ou=config objectclass: top objectclass: ads-base objectclass: ads-transport objectclass: ads-udpTransport -ads-transportid: ntp-http +ads-transportid: https ads-transportaddress: localhost ads-systemport: 456 ads-transportenablessl: true Modified: directory/apacheds/trunk/server-config/src/test/resources/kerberosServer.ldif URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/resources/kerberosServer.ldif?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/test/resources/kerberosServer.ldif (original) +++ directory/apacheds/trunk/server-config/src/test/resources/kerberosServer.ldif Wed Dec 5 14:27:30 2012 @@ -10,32 +10,9 @@ objectclass: ads-directoryService ads-directoryserviceid: default ads-dsreplicaid: 1 ads-dssyncperiodmillis: 15000 -ads-dsmaxpdusize: 2000000 ads-dsallowanonymousaccess: true ads-dsaccesscontrolenabled: false ads-dsdenormalizeopattrsenabled: false -ads-servers: changepasswordserver -ads-servers: dns -ads-servers: httpserver -ads-servers: kerberos -ads-servers: ldapserver -ads-servers: ntp -ads-partitions: example -ads-partitions: system -ads-interceptors: aciAuthorizationInterceptor -ads-interceptors: authenticationInterceptor -ads-interceptors: collectiveAttributeInterceptor -ads-interceptors: defaultAuthorizationInterceptor -ads-interceptors: eventInterceptor -ads-interceptors: exceptionInterceptor -ads-interceptors: keyderivationinterceptor -ads-interceptors: normalizationInterceptor -ads-interceptors: operationalAttributeInterceptor -ads-interceptors: passwordpolicyinterceptor -ads-interceptors: referralInterceptor -ads-interceptors: schemaInterceptor -ads-interceptors: subentryInterceptor -ads-interceptors: triggerInterceptor ads-enabled: true dn: ou=servers,ads-directoryServiceId=default,ou=config @@ -71,23 +48,23 @@ ou: transports objectclass: organizationalUnit objectclass: top -dn: ads-transportid=ldap1,ou=transports,ads-serverId=kdcServer,ou=servers,ads-directoryServiceId=default,ou=config +dn: ads-transportid=tcp,ou=transports,ads-serverId=kdcServer,ou=servers,ads-directoryServiceId=default,ou=config ads-systemport: 10389 ads-transportenablessl: false ads-transportbacklog: 50 ads-transportnbthreads: 8 ads-transportaddress: 0.0.0.0 -ads-transportid: ldap1 +ads-transportid: tcp objectclass: ads-transport objectclass: ads-tcpTransport objectclass: top ads-enabled: true -dn: ads-transportid=ldaps,ou=transports,ads-serverId=kdcServer,ou=servers,ads-directoryServiceId=default,ou=config +dn: ads-transportid=udp,ou=transports,ads-serverId=kdcServer,ou=servers,ads-directoryServiceId=default,ou=config ads-systemport: 10636 ads-transportenablessl: true ads-transportaddress: localhost -ads-transportid: ldaps +ads-transportid: udp objectclass: ads-transport objectclass: ads-tcpTransport objectclass: top Modified: directory/apacheds/trunk/server-config/src/test/resources/ldapServer.ldif URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/test/resources/ldapServer.ldif?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/apacheds/trunk/server-config/src/test/resources/ldapServer.ldif (original) +++ directory/apacheds/trunk/server-config/src/test/resources/ldapServer.ldif Wed Dec 5 14:27:30 2012 @@ -10,32 +10,9 @@ objectclass: ads-directoryService ads-directoryserviceid: default ads-dsreplicaid: 1 ads-dssyncperiodmillis: 15000 -ads-dsmaxpdusize: 2000000 ads-dsallowanonymousaccess: true ads-dsaccesscontrolenabled: false ads-dsdenormalizeopattrsenabled: false -ads-servers: changepasswordserver -ads-servers: dns -ads-servers: httpserver -ads-servers: kerberos -ads-servers: ldapserver -ads-servers: ntp -ads-partitions: example -ads-partitions: system -ads-interceptors: aciAuthorizationInterceptor -ads-interceptors: authenticationInterceptor -ads-interceptors: collectiveAttributeInterceptor -ads-interceptors: defaultAuthorizationInterceptor -ads-interceptors: eventInterceptor -ads-interceptors: exceptionInterceptor -ads-interceptors: keyderivationinterceptor -ads-interceptors: normalizationInterceptor -ads-interceptors: operationalAttributeInterceptor -ads-interceptors: passwordpolicyinterceptor -ads-interceptors: referralInterceptor -ads-interceptors: schemaInterceptor -ads-interceptors: subentryInterceptor -ads-interceptors: triggerInterceptor ads-enabled: true dn: ou=servers,ads-directoryServiceId=default,ou=config @@ -53,6 +30,7 @@ description: a LDAP server instance ads-confidentialityRequired: false ads-maxSizeLimit: 1000 ads-maxTimeLimit: 15000 +ads-maxpdusize: 2000000 ads-saslHost: ldap.example.com ads-saslPrincipal: ldap/ldap.example.com@EXAMPLE.COM ads-saslRealms: example.com Modified: directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java (original) +++ directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java Wed Dec 5 14:27:30 2012 @@ -925,6 +925,9 @@ public class ServiceBuilder // Max time limit ldapServer.setMaxTimeLimit( ldapServerBean.getLdapServerMaxTimeLimit() ); + + // MaxPDUSize + ldapServer.setMaxPDUSize( ldapServerBean.getMaxPDUSize() ); // Sasl Host ldapServer.setSaslHost( ldapServerBean.getLdapServerSaslHost() ); @@ -1380,9 +1383,6 @@ public class ServiceBuilder directoryService.setJournal( journal ); } - // MaxPDUSize - directoryService.setMaxPDUSize( directoryServiceBean.getDsMaxPDUSize() ); - // PasswordHidden directoryService.setPasswordHidden( directoryServiceBean.isDsPasswordHidden() ); Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.110.ldif URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.110.ldif?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.110.ldif (original) +++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.110.ldif Wed Dec 5 14:27:30 2012 @@ -1,6 +1,6 @@ version: 1 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.110,ou=attributeTypes,cn=adsconfig,ou=schema -m-name: ads-dsMaxPDUSize +m-name: ads-maxPDUSize m-description: Gives the maximum size of a PDU m-oid: 1.3.6.1.4.1.18060.0.4.1.2.110 objectclass: top Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.309.ldif URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.309.ldif?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.309.ldif (original) +++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.309.ldif Wed Dec 5 14:27:30 2012 @@ -1,15 +1,12 @@ version: 1 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.309,ou=attributeTypes,cn=adsconfig,ou=schema -m-ordering: caseExactOrderingMatch -m-singlevalue: TRUE m-oid: 1.3.6.1.4.1.18060.0.4.1.2.309 m-description: The certificate passord -m-substr: caseExactSubstringsMatch objectclass: metaTop objectclass: metaAttributeType objectclass: top -m-syntax: 1.3.6.1.4.1.1466.115.121.1.15 +m-supattributetype: userPassword +m-syntax: 1.3.6.1.4.1.1466.115.121.1.40 m-name: ads-certificatePassword creatorsname: uid=admin,ou=system -m-equality: caseExactMatch -m-length: 0 +m-equality: octetStringMatch Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.100.ldif URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.100.ldif?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.100.ldif (original) +++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.100.ldif Wed Dec 5 14:27:30 2012 @@ -9,16 +9,15 @@ objectclass: metaObjectClass m-supobjectclass: ads-base m-must: ads-directoryServiceId m-must: ads-dsReplicaId -m-must: ads-interceptors -m-must: ads-partitions +m-may: ads-interceptors +m-may: ads-partitions m-may: ads-servers -m-may: ads-dsAccessControlEnabled -m-may: ads-dsAllowAnonymousAccess +m-must: ads-dsAccessControlEnabled +m-must: ads-dsAllowAnonymousAccess m-may: ads-changeLog -m-may: ads-dsDenormalizeOpAttrsEnabled +m-must: ads-dsDenormalizeOpAttrsEnabled m-may: ads-journal -m-may: ads-dsMaxPDUSize -m-may: ads-dsPasswordHidden -m-may: ads-dsSyncPeriodMillis +m-must: ads-dsPasswordHidden +m-must: ads-dsSyncPeriodMillis m-may: ads-dsTestEntries creatorsname: uid=admin,ou=system Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.120.ldif URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.120.ldif?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.120.ldif (original) +++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.120.ldif Wed Dec 5 14:27:30 2012 @@ -9,4 +9,4 @@ objectclass: metaTop objectclass: top m-name: ads-changeLog creatorsname: uid=admin,ou=system -m-may: ads-changeLogExposed +m-must: ads-changeLogExposed Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.140.ldif URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.140.ldif?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.140.ldif (original) +++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.140.ldif Wed Dec 5 14:27:30 2012 @@ -10,5 +10,5 @@ objectclass: metaTop objectclass: top m-name: ads-journal creatorsname: uid=admin,ou=system -m-may: ads-journalWorkingDir -m-may: ads-journalRotation +m-must: ads-journalWorkingDir +m-must: ads-journalRotation Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.18.ldif URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.18.ldif?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.18.ldif (original) +++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.18.ldif Wed Dec 5 14:27:30 2012 @@ -11,7 +11,7 @@ objectclass: top m-name: ads-transport m-typeobjectclass: ABSTRACT creatorsname: uid=admin,ou=system -m-may: ads-transportAddress +m-must: ads-transportAddress m-may: ads-transportBacklog m-may: ads-transportEnableSSL m-may: ads-transportNbThreads Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.300.ldif?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif (original) +++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.300.ldif Wed Dec 5 14:27:30 2012 @@ -8,16 +8,17 @@ objectclass: metaTop objectclass: top m-name: ads-ldapServer creatorsname: uid=admin,ou=system -m-may: ads-confidentialityRequired -m-may: ads-maxSizeLimit -m-may: ads-maxTimeLimit -m-may: ads-saslHost -m-may: ads-saslPrincipal -m-may: ads-saslRealms +m-must: ads-confidentialityRequired +m-must: ads-maxSizeLimit +m-must: ads-maxTimeLimit +m-must: ads-maxPDUSize +m-must: ads-saslHost +m-must: ads-saslPrincipal +m-must: ads-saslRealms m-may: ads-keystoreFile m-may: ads-certificatePassword m-may: ads-replReqHandler m-may: ads-saslMechHandlers m-may: ads-extendedOpHandlers m-may: ads-replConsumers -m-may: ads-replEnabled +m-must: ads-replEnabled Modified: directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.803.ldif URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.803.ldif?rev=1417441&r1=1417440&r2=1417441&view=diff ============================================================================== --- directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.803.ldif (original) +++ directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.803.ldif Wed Dec 5 14:27:30 2012 @@ -10,4 +10,4 @@ objectclass: metaTop objectclass: top m-name: ads-httpWebApp creatorsname: uid=admin,ou=system -m-may: ads-httpAppCtxPath +m-must: ads-httpAppCtxPath