Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 68108 invoked from network); 30 Oct 2010 14:31:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 30 Oct 2010 14:31:33 -0000 Received: (qmail 43174 invoked by uid 500); 30 Oct 2010 14:31:33 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 43120 invoked by uid 500); 30 Oct 2010 14:31:33 -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 43113 invoked by uid 99); 30 Oct 2010 14:31:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Oct 2010 14:31:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sat, 30 Oct 2010 14:31:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CB0EB238897A; Sat, 30 Oct 2010 14:30:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1029081 [1/4] - in /directory/apacheds/trunk/server-config: ./ src/main/java/org/apache/directory/server/config/ src/main/java/org/apache/directory/server/config/beans/ src/main/resources/ src/main/resources/config/ src/main/resources/conf... Date: Sat, 30 Oct 2010 14:30:34 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101030143034.CB0EB238897A@eris.apache.org> Author: elecharny Date: Sat Oct 30 14:30:31 2010 New Revision: 1029081 URL: http://svn.apache.org/viewvc?rev=1029081&view=rev Log: merged back the config branch into trunk Added: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigBuilder.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigBuilder.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigurationException.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/ConfigurationException.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ConfigBean.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ConfigBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver/ou=transports/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver/ou=transports/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver/ou=transports.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver/ou=transports.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=tcp.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=tcp.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=udp.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=changepasswordserver/ou=transports/ads-transportid=udp.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns/ou=transports/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns/ou=transports/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns/ou=transports.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns/ou=transports.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=tcp.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=tcp.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=udp.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=dns/ou=transports/ads-transportid=udp.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=httpserver/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=httpserver/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=httpserver.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=httpserver.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=httpserver/ou=webapps/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=httpserver/ou=webapps/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=httpserver/ou=webapps.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=httpserver/ou=webapps.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=httpserver/ou=webapps/ads-id=testapp.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=httpserver/ou=webapps/ads-id=testapp.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos/ou=transports/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos/ou=transports/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos/ou=transports.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos/ou=transports.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=tcp.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=tcp.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=udp.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=kerberos/ou=transports/ads-transportid=udp.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=gracefulshutdownhandler.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=gracefulshutdownhandler.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=starttlshandler.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=starttlshandler.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=storedprochandler.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=extendedoperatiohandlers/ads-id=storedprochandler.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=cram-md5.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=cram-md5.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=digest-md5.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=digest-md5.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gss-spnego.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gss-spnego.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gssapi.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=gssapi.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=ntlm.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=ntlm.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=simple.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=saslmechanisms/ads-ldapServerSaslMechName=simple.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=transports/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=transports/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=transports.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=transports.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldap.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldap.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldaps.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ldapserver/ou=transports/ads-transportid=ldaps.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ntp/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ntp/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ntp.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ntp.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ntp/ou=transports/ - copied from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ntp/ou=transports/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ntp/ou=transports.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ntp/ou=transports.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=tcp.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=tcp.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=udp.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/main/resources/config/ou=config/ads-directoryserviceid=default/ou=servers/ads-serverid=ntp/ou=transports/ads-transportid=udp.ldif directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/DhcpServerConfigReaderTest.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/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 - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/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/HttpServerConfigReaderTest.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/NtpServerConfigReaderTest.java - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/test/java/org/apache/directory/server/config/NtpServerConfigReaderTest.java directory/apacheds/trunk/server-config/src/test/resources/changePasswordServer.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/test/resources/changePasswordServer.ldif directory/apacheds/trunk/server-config/src/test/resources/dhcpServer.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/test/resources/dhcpServer.ldif directory/apacheds/trunk/server-config/src/test/resources/dnsServer.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/test/resources/dnsServer.ldif directory/apacheds/trunk/server-config/src/test/resources/httpServer.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/test/resources/httpServer.ldif directory/apacheds/trunk/server-config/src/test/resources/kerberosServer.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/test/resources/kerberosServer.ldif directory/apacheds/trunk/server-config/src/test/resources/ldapServer.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/test/resources/ldapServer.ldif directory/apacheds/trunk/server-config/src/test/resources/ntpServer.ldif - copied unchanged from r1029077, directory/apacheds/branches/apacheds-config/server-config/src/test/resources/ntpServer.ldif Removed: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AdsIndexBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/AdsServerBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/BaseAdsBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/CatalogBasedServerBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryBackedServiceBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerExtendedOpHandlerBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerSaslMechanisHandlerBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ProtocolServiceBean.java directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers/ directory/apacheds/trunk/server-config/src/main/resources/config/ou=config/ou=servers.ldif Modified: directory/apacheds/trunk/server-config/ (props changed) directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (contents, props changed) directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/DhcpServerBean.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/DnsServerBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TcpTransportBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/beans/UdpTransportBean.java directory/apacheds/trunk/server-config/src/main/resources/ (props changed) directory/apacheds/trunk/server-config/src/main/resources/config.ldif directory/apacheds/trunk/server-config/src/main/resources/config/ou=config.ldif directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (contents, props changed) Propchange: directory/apacheds/trunk/server-config/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Oct 30 14:30:31 2010 @@ -1,2 +1,3 @@ /directory/apacheds/branches/apacheds-codec-merge/server-config:982369-987590 +/directory/apacheds/branches/apacheds-config/server-config:1023442-1029077 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-config:980138-980938