You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/10/22 12:58:46 UTC
svn commit: r1026291 - in /directory:
apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/
apacheds/branches/apacheds-config/server-config/src/main/resources/
shared/branches/shared-config/ldap-schema/...
Author: elecharny
Date: Fri Oct 22 10:58:45 2010
New Revision: 1026291
URL: http://svn.apache.org/viewvc?rev=1026291&view=rev
Log:
o Fixed some toString
o Modified some AT names
Modified:
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java
directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif
directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.811.ldif
directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.802.ldif
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java?rev=1026291&r1=1026290&r2=1026291&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java Fri Oct 22 10:58:45 2010
@@ -70,7 +70,7 @@ public class DSBasedServerBean extends S
*/
public String toString( String tabs )
{
- return super.toString( tabs ) + tabs + " SearchBaseDN : " + searchbasedn + "\n";
+ return super.toString( tabs ) + tabs + "searchBaseDN : " + searchbasedn + "\n";
}
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java?rev=1026291&r1=1026290&r2=1026291&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java Fri Oct 22 10:58:45 2010
@@ -25,7 +25,7 @@ package org.apache.directory.server.conf
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ExtendedOpHandlerBean
+public class ExtendedOpHandlerBean extends AdsBaseBean
{
/** The Extended Operation ID */
private String extendedopid;
@@ -86,8 +86,8 @@ public class ExtendedOpHandlerBean
StringBuilder sb = new StringBuilder();
sb.append( tabs ).append( "Extended operation handler :\n" );
- sb.append( tabs ).append( " extended operation ID :" ).append( extendedopid ).append( '\n' );
- sb.append( tabs ).append( " extended operation handler class :" ).append( extendedophandlerclass ).append( '\n' );
+ sb.append( tabs ).append( " extended operation ID : " ).append( extendedopid ).append( '\n' );
+ sb.append( tabs ).append( " extended operation handler class : " ).append( extendedophandlerclass ).append( '\n' );
return sb.toString();
}
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java?rev=1026291&r1=1026290&r2=1026291&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java Fri Oct 22 10:58:45 2010
@@ -48,7 +48,7 @@ public class LdapServerBean extends DSBa
private String saslprincipal;
/** The SASL realms */
- private Set<String> saslrealms = new HashSet<String>();;
+ private Set<String> saslrealms = new HashSet<String>();
/** The keystore file */
private String keystorefile;
@@ -59,6 +59,9 @@ public class LdapServerBean extends DSBa
/** tells if the replication is enabled */
private boolean enablereplprovider;
+ private int replconsumer;
+ private int replprovider;
+
/** The list of supported mechanisms */
private Set<SaslMechanisHandlerBean> saslmechhandlers = new HashSet<SaslMechanisHandlerBean>();
@@ -188,7 +191,7 @@ public class LdapServerBean extends DSBa
/**
* @param ldapServerSaslRealms the ldapServerSaslRealms to add
*/
- public void addLdapServerSaslRealms( String... ldapServerSaslRealms )
+ public void addsaslrealms( String... ldapServerSaslRealms )
{
for ( String saslRealm : ldapServerSaslRealms )
{
@@ -338,16 +341,16 @@ public class LdapServerBean extends DSBa
sb.append( tabs ).append( "LdapServer :\n" );
sb.append( super.toString( tabs + " " ) );
- sb.append( tabs ).append( " max size limit : " ).append( maxsizelimit );
- sb.append( tabs ).append( " max time limit : " ).append( maxtimelimit );
+ sb.append( tabs ).append( " max size limit : " ).append( maxsizelimit ).append( '\n' );
+ sb.append( tabs ).append( " max time limit : " ).append( maxtimelimit ).append( '\n' );
sb.append( toString( tabs, " certificate password", certificatepassword ) );
sb.append( toString( tabs, " keystore file", keystorefile ) );
sb.append( toString( tabs, " sasl principal", saslprincipal ) );
- sb.append( tabs ).append( " sasl host : " ).append( saslhost );
+ sb.append( tabs ).append( " sasl host : " ).append( saslhost ).append( '\n' );
sb.append( toStringBoolean( tabs, " confidentiality required", confidentialityrequired ) );
sb.append( toStringBoolean( tabs, " enable replication provider", enablereplprovider ) );
- if ( extendedophandlers != null )
+ if ( ( extendedophandlers != null ) && ( extendedophandlers.size() > 0 ) )
{
sb.append( tabs ).append( " extended operation handlers :\n" );
@@ -367,13 +370,13 @@ public class LdapServerBean extends DSBa
}
}
- if ( saslrealms != null )
+ if ( ( saslrealms != null ) && ( saslrealms.size() > 0 ) )
{
sb.append( tabs ).append( " SASL realms :\n" );
for ( String saslRealm : saslrealms )
{
- sb.append( tabs ).append( " " ).append( saslRealm ).append( "\n" );
+ sb.append( tabs ).append( " " ).append( saslRealm ).append( "\n" );
}
}
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java?rev=1026291&r1=1026290&r2=1026291&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java Fri Oct 22 10:58:45 2010
@@ -103,15 +103,15 @@ public abstract class ServerBean extends
{
StringBuilder sb = new StringBuilder();
- sb.append( super.toString( tabs + " " ) );
- sb.append( tabs ).append( " server id : " ).append( serverid ).append( '\n' );
- sb.append( tabs ).append( " transports : \n" );
+ sb.append( super.toString( tabs ) );
+ sb.append( tabs ).append( "server id : " ).append( serverid ).append( '\n' );
+ sb.append( tabs ).append( "transports : \n" );
if ( transports != null )
{
for ( TransportBean transport : transports )
{
- sb.append( transport.toString( tabs + " " ) );
+ sb.append( transport.toString( tabs + " " ) );
}
}
Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif?rev=1026291&r1=1026290&r2=1026291&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif (original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config.ldif Fri Oct 22 10:58:45 2010
@@ -540,15 +540,15 @@ objectclass: ads-server
objectclass: ads-ldapServer
objectclass: ads-dsBasedServer
objectclass: top
-ads-serverid: ldapServer
-ads-ldapServerConfidentialityRequired: false
-ads-ldapservermaxsizelimit: 1000
-ads-ldapservermaxtimelimit: 15000
-ads-ldapserversaslhost: ldap.example.com
-ads-ldapserversaslprincipal: ldap/ldap.example.com@EXAMPLE.COM
-ads-ldapserversaslrealms: example.com
-ads-ldapserversaslrealms: apache.org
-ads-searchbasedn: ou=users,ou=system
+ads-serverId: ldapServer
+ads-confidentialityRequired: false
+ads-maxSizeLimit: 1000
+ads-maxTimeLimit: 15000
+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-enableReplProvider: false
@@ -557,7 +557,7 @@ ou: transports
objectclass: organizationalUnit
objectclass: top
-dn: ads-transportid=ldap,ou=transports,ads-serverId=ldapServer,ou=servers,ou=config
+dn: ads-transportid=ldap,ou=transports,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 10389
ads-transportenablessl: false
ads-transportbacklog: 50
@@ -569,7 +569,7 @@ objectclass: ads-tcpTransport
objectclass: top
ads-enabled: true
-dn: ads-transportid=ldaps,ou=transports,ads-serverId=ldapServer,ou=servers,ou=config
+dn: ads-transportid=ldaps,ou=transports,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-systemport: 10636
ads-transportenablessl: true
ads-transportaddress: localhost
@@ -579,52 +579,52 @@ objectclass: ads-tcpTransport
objectclass: top
ads-enabled: true
-dn: ou=extendedoperatiohandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
-ou: extendedoperatiohandlers
+dn: ou=extendedophandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ou: extendedophandlers
objectclass: organizationalUnit
objectclass: top
-dn: ads-extendedOpId=gracefulShutdownHandler,ou=extendedoperatiohandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-extendedOpId=gracefulShutdownHandler,ou=extendedophandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-extendedOpId: gracefulShutdownHandler
-ads-ldapserverextendedophandlerclass: org.apache.directory.server.ldap.handlers.extended.GracefulShutdownHandler
-objectclass: ads-ldapServerExtendedOpHandler
+ads-extendedOpHandlerclass: org.apache.directory.server.ldap.handlers.extended.GracefulShutdownHandler
+objectclass: ads-extendedOpHandler
objectclass: top
ads-enabled: true
-dn: ads-extendedOpId=starttlshandler,ou=extendedoperatiohandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-extendedOpId=starttlshandler,ou=extendedophandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-extendedOpId: starttlshandler
-ads-ldapserverextendedophandlerclass: org.apache.directory.server.ldap.handlers.extended.StartTlsHandler
-objectclass: ads-ldapServerExtendedOpHandler
+ads-extendedOpHandlerclass: org.apache.directory.server.ldap.handlers.extended.StartTlsHandler
+objectclass: ads-extendedOpHandler
objectclass: top
ads-enabled: true
-dn: ads-extendedOpId=storedprochandler,ou=extendedoperatiohandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-extendedOpId=storedprochandler,ou=extendedophandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-enabled: false
ads-extendedOpId: storedprochandler
-ads-ldapserverextendedophandlerclass: org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler
-objectclass: ads-ldapServerExtendedOpHandler
+ads-extendedOpHandlerclass: org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler
+objectclass: ads-extendedOpHandler
objectclass: top
-dn: ou=saslmechanisms,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
-ou: saslmechanisms
+dn: ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+ou: saslmechhandlers
objectclass: organizationalUnit
objectclass: top
-dn: ads-ldapServerSaslMechName=cram-md5,ou=saslmechanisms,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-ldapServerSaslMechName=cram-md5,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-ldapserversaslmechclassname: org.apache.directory.server.ldap.handlers.bind.cramMD5.CramMd5MechanismHandler
objectclass: ads-ldapServerSaslMechanismHandler
objectclass: top
ads-ldapserversaslmechname: CRAM-MD5
ads-enabled: true
-dn: ads-ldapServerSaslMechName=digest-md5,ou=saslmechanisms,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-ldapServerSaslMechName=digest-md5,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-ldapserversaslmechclassname: org.apache.directory.server.ldap.handlers.bind.digestMD5.DigestMd5MechanismHandler
objectclass: ads-ldapServerSaslMechanismHandler
objectclass: top
ads-ldapserversaslmechname: DIGEST-MD5
ads-enabled: true
-dn: ads-ldapServerSaslMechName=gss-spnego,ou=saslmechanisms,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-ldapServerSaslMechName=gss-spnego,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-ldapserversaslmechclassname: org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler
objectclass: ads-ldapServerSaslMechanismHandler
objectclass: top
@@ -632,14 +632,14 @@ ads-ldapserversaslmechname: GSS-SPNEGO
ads-ldapserverntlmmechprovider: com.foo.Bar
ads-enabled: true
-dn: ads-ldapServerSaslMechName=gssapi,ou=saslmechanisms,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-ldapServerSaslMechName=gssapi,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-ldapserversaslmechclassname: org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler
objectclass: ads-ldapServerSaslMechanismHandler
objectclass: top
ads-ldapserversaslmechname: GSSAPI
ads-enabled: true
-dn: ads-ldapServerSaslMechName=ntlm,ou=saslmechanisms,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-ldapServerSaslMechName=ntlm,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-ldapserversaslmechclassname: org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler
objectclass: ads-ldapServerSaslMechanismHandler
objectclass: top
@@ -647,7 +647,7 @@ ads-ldapserversaslmechname: NTLM
ads-ldapserverntlmmechprovider: com.foo.Bar
ads-enabled: true
-dn: ads-ldapServerSaslMechName=simple,ou=saslmechanisms,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
+dn: ads-ldapServerSaslMechName=simple,ou=saslmechhandlers,ads-serverId=ldapServer,ou=servers,ads-directoryServiceId=default,ou=config
ads-ldapserversaslmechclassname: org.apache.directory.server.ldap.handlers.bind.SimpleMechanismHandler
objectclass: ads-ldapServerSaslMechanismHandler
objectclass: top
Modified: directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.811.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.811.ldif?rev=1026291&r1=1026290&r2=1026291&view=diff
==============================================================================
--- directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.811.ldif (original)
+++ directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.811.ldif Fri Oct 22 10:58:45 2010
@@ -4,7 +4,7 @@ dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.811,
objectclass: top
objectclass: metaTop
objectclass: metaAttributeType
-m-name: ads-extendedOpHandlerClassName
+m-name: ads-extendedOpHandlerClass
m-description: Fully qualified class name of the extended operation handler
m-oid: 1.3.6.1.4.1.18060.0.4.1.2.811
m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
Modified: directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.802.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.802.ldif?rev=1026291&r1=1026290&r2=1026291&view=diff
==============================================================================
--- directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.802.ldif (original)
+++ directory/shared/branches/shared-config/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.802.ldif Fri Oct 22 10:58:45 2010
@@ -10,5 +10,5 @@ m-description: Extended operation handle
createtimestamp: 20100111145218Z
creatorsname: 0.9.2342.19200300.100.1.1=admin,2.5.4.11=system
entrycsn: 20100111202218.409000Z#000000#000#000000
-m-must: ads-extendedOpHandlerClassName
+m-must: ads-extendedOpHandlerClass
m-must: ads-extendedOpId