directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r987485 [2/2] - in /directory: apacheds/branches/apacheds-codec-merge/ldap-client-test/ apacheds/branches/apacheds-codec-merge/server-config/ apacheds/branches/apacheds-codec-merge/server-config/src/main/java/org/apache/directory/server/con...
Date Fri, 20 Aug 2010 12:57:57 GMT
Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=tcp.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Ddns/ou%3Dtransports/ads-transportid%3Dtcp.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=tcp.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=tcp.ldif
Fri Aug 20 12:57:55 2010
@@ -5,3 +5,4 @@ ads-transportid: tcp
 objectclass: ads-transport
 objectclass: ads-tcpTransport
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=udp.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Ddns/ou%3Dtransports/ads-transportid%3Dudp.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=udp.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=udp.ldif
Fri Aug 20 12:57:55 2010
@@ -5,3 +5,4 @@ ads-transportid: udp
 objectclass: ads-transport
 objectclass: ads-udpTransport
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dkerberos.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos.ldif
Fri Aug 20 12:57:55 2010
@@ -1,9 +1,21 @@
 version: 1
 dn: ads-serverId=kerberos,ou=servers,ou=config
-ads-serverds: ads-directoryServiceId=default,ou=directoryService,ou=config
-ads-serverid: kerberos
-ads-enabled: false
 objectclass: ads-server
 objectclass: ads-kerberosServer
 objectclass: ads-catalogBasedServer
 objectclass: top
+ads-serverid: kerberos
+ads-enabled: false
+ads-krbAllowableClockSkew: 300000
+ads-krbBodyChecksumVerified: true
+ads-krbEmptyAddressesAllowed: true
+ads-krbEncryptionTypes: des-cbc-md5
+ads-krbForwardableAllowed: true
+ads-krbKdcPrincipal: krbtgt/EXAMPLE.COM@EXAMPLE.COM
+ads-krbmaximumrenewablelifetime: 604800000
+ads-krbMaximumTicketLifetime: 86400000
+ads-krbPaEncTimestampRequired: true
+ads-krbPostdatedAllowed: true
+ads-krbPrimaryRealm: EXAMPLE.COM
+ads-krbProxiableAllowed: true
+ads-krbRenewableAllowed: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=tcp.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dkerberos/ou%3Dtransports/ads-transportid%3Dtcp.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=tcp.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=tcp.ldif
Fri Aug 20 12:57:55 2010
@@ -8,3 +8,4 @@ ads-transportid: tcp
 objectclass: ads-transport
 objectclass: ads-tcpTransport
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=udp.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dkerberos/ou%3Dtransports/ads-transportid%3Dudp.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=udp.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=udp.ldif
Fri Aug 20 12:57:55 2010
@@ -8,3 +8,4 @@ ads-transportid: udp
 objectclass: ads-transport
 objectclass: ads-udpTransport
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dldapserver.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver.ldif
Fri Aug 20 12:57:55 2010
@@ -1,16 +1,17 @@
 version: 1
 dn: ads-serverId=ldapServer,ou=servers,ou=config
-ads-ldapserverallowanonymousaccess: false
-ads-serverds: ads-directoryServiceId=default,ou=directoryService,ou=config
-ads-serverid: ldapServer
-ads-ldapserversaslrealms: example.com
-ads-ldapserversaslrealms: apache.org
-ads-ldapserversaslhost: ldap.example.com
-ads-ldapserversaslprincipal: ldap/ldap.example.com@EXAMPLE.COM
-ads-searchbasedn: ou=users,ou=system
-ads-ldapservermaxtimelimit: 15000
-ads-ldapservermaxsizelimit: 1000
 objectclass: ads-server
 objectclass: ads-ldapServer
 objectclass: ads-catalogBasedServer
 objectclass: top
+ads-serverid: ldapServer
+ads-ldapserverallowanonymousaccess: false
+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-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=gracefulshutdownhandler.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dldapserver/ou%3Dextendedoperatiohandlers/ads-id%3Dgracefulshutdownhandler.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=gracefulshutdownhandler.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=gracefulshutdownhandler.ldif
Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-ldapserverextendedophandlerclass: or
  extended.GracefulShutdownHandler
 objectclass: ads-ldapServerExtendedOpHandler
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=starttlshandler.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dldapserver/ou%3Dextendedoperatiohandlers/ads-id%3Dstarttlshandler.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=starttlshandler.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=starttlshandler.ldif
Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-ldapserverextendedophandlerclass: or
  extended.StartTlsHandler
 objectclass: ads-ldapServerExtendedOpHandler
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=cram-md5.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dldapserver/ou%3Dsaslmechanisms/ads-ldapServerSaslMechName%3Dcram-md5.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=cram-md5.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=cram-md5.ldif
Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-ldapserversaslmechclassname: org.apa
 objectclass: ads-ldapServerSaslMechanismHandler
 objectclass: top
 ads-ldapserversaslmechname: CRAM-MD5
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=digest-md5.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dldapserver/ou%3Dsaslmechanisms/ads-ldapServerSaslMechName%3Ddigest-md5.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=digest-md5.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=digest-md5.ldif
Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-ldapserversaslmechclassname: org.apa
 objectclass: ads-ldapServerSaslMechanismHandler
 objectclass: top
 ads-ldapserversaslmechname: DIGEST-MD5
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gss-spnego.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dldapserver/ou%3Dsaslmechanisms/ads-ldapServerSaslMechName%3Dgss-spnego.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gss-spnego.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gss-spnego.ldif
Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ objectclass: ads-ldapServerSaslMechanism
 objectclass: top
 ads-ldapserversaslmechname: GSS-SPNEGO
 ads-ldapserverntlmmechprovider: com.foo.Bar
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gssapi.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dldapserver/ou%3Dsaslmechanisms/ads-ldapServerSaslMechName%3Dgssapi.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gssapi.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gssapi.ldif
Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-ldapserversaslmechclassname: org.apa
 objectclass: ads-ldapServerSaslMechanismHandler
 objectclass: top
 ads-ldapserversaslmechname: GSSAPI
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=ntlm.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dldapserver/ou%3Dsaslmechanisms/ads-ldapServerSaslMechName%3Dntlm.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=ntlm.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=ntlm.ldif
Fri Aug 20 12:57:55 2010
@@ -7,3 +7,4 @@ objectclass: ads-ldapServerSaslMechanism
 objectclass: top
 ads-ldapserversaslmechname: NTLM
 ads-ldapserverntlmmechprovider: com.foo.Bar
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=simple.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dldapserver/ou%3Dsaslmechanisms/ads-ldapServerSaslMechName%3Dsimple.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=simple.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=simple.ldif
Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-ldapserversaslmechclassname: org.apa
 objectclass: ads-ldapServerSaslMechanismHandler
 objectclass: top
 ads-ldapserversaslmechname: SIMPLE
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldap.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dldapserver/ou%3Dtransports/ads-transportid%3Dldap.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldap.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldap.ldif
Fri Aug 20 12:57:55 2010
@@ -10,3 +10,4 @@ ads-transportid: ldap
 objectclass: ads-transport
 objectclass: ads-tcpTransport
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldaps.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dldapserver/ou%3Dtransports/ads-transportid%3Dldaps.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldaps.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldaps.ldif
Fri Aug 20 12:57:55 2010
@@ -8,3 +8,4 @@ ads-transportid: ldaps
 objectclass: ads-transport
 objectclass: ads-tcpTransport
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=tcp.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dntp/ou%3Dtransports/ads-transportid%3Dtcp.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=tcp.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=tcp.ldif
Fri Aug 20 12:57:55 2010
@@ -5,3 +5,4 @@ ads-transportid: tcp
 objectclass: ads-transport
 objectclass: ads-tcpTransport
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=udp.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou%3Dconfig/ou%3Dservers/ads-serverid%3Dntp/ou%3Dtransports/ads-transportid%3Dudp.ldif?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=udp.ldif
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/main/resources/config/ou=config/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=udp.ldif
Fri Aug 20 12:57:55 2010
@@ -6,3 +6,4 @@ ads-transportid: udp
 objectclass: ads-transport
 objectclass: ads-udpTransport
 objectclass: top
+ads-enabled: true

Modified: directory/apacheds/branches/apacheds-codec-merge/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java?rev=987485&r1=987484&r2=987485&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
Fri Aug 20 12:57:55 2010
@@ -113,7 +113,7 @@ public class ConfigPartitionReaderTest
         configPartition.initialize();
 
         ConfigPartitionReader cpReader = new ConfigPartitionReader( configPartition );
-        dirService = cpReader.getDirectoryService();
+        dirService = cpReader.createDirectoryService();
 
         SchemaPartition schemaPartition = dirService.getSchemaService().getSchemaPartition();
 
@@ -127,7 +127,7 @@ public class ConfigPartitionReaderTest
         dirService.setSchemaManager( schemaManager );
         dirService.startup();
 
-        server = cpReader.getLdapServer();
+        server = cpReader.createLdapServer();
         server.setDirectoryService( dirService );
 
         // this is a hack to use a different port than the one

Propchange: directory/apacheds/branches/apacheds-codec-merge/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:57:55 2010
@@ -1,7 +1,8 @@
+/directory/apacheds/branches/apacheds-cidit/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:898675-899143
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:980138-980938
 /directory/apacheds/branches/apacheds-replication/core-annotations/src/main/java/org/apache/directory/server/core/factory/CiDITDirectoryServiceFactory.java:749790-764110
 /directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/factory/CiDITDirectoryServiceFactory.java:806623-896441
 /directory/apacheds/branches/apacheds-subtree/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:965203-965686
 /directory/apacheds/branches/cidit/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:900288-900681
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:945827-946347
-/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:980025-980137
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:980025-980137,982368-987474

Propchange: directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:57:55 2010
@@ -1,2 +1,2 @@
 /directory/clients/ldap/branches/ldap-client-subtree/ldap-client-api:965547-965686
-/directory/clients/ldap/trunk/ldap-client-api:982371-982965
+/directory/clients/ldap/trunk/ldap-client-api:982371-987478



Mime
View raw message