From commits-return-26671-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Thu Jul 22 07:45:12 2010 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 76686 invoked from network); 22 Jul 2010 07:45:12 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 22 Jul 2010 07:45:12 -0000 Received: (qmail 9574 invoked by uid 500); 22 Jul 2010 07:45:11 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 9499 invoked by uid 500); 22 Jul 2010 07:45:10 -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 9489 invoked by uid 99); 22 Jul 2010 07:45:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Jul 2010 07:45:09 +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; Thu, 22 Jul 2010 07:43:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 692242388A64; Thu, 22 Jul 2010 07:42:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r966530 - in /directory/apacheds/branches/apacheds-subtree/server-config: ./ src/main/java/org/apache/directory/server/config/ src/main/resources/ src/test/java/org/apache/directory/server/config/ Date: Thu, 22 Jul 2010 07:42:36 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100722074236.692242388A64@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Thu Jul 22 07:42:35 2010 New Revision: 966530 URL: http://svn.apache.org/viewvc?rev=966530&view=rev Log: Merged back the trunk Modified: directory/apacheds/branches/apacheds-subtree/server-config/ (props changed) directory/apacheds/branches/apacheds-subtree/server-config/pom.xml directory/apacheds/branches/apacheds-subtree/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (props changed) directory/apacheds/branches/apacheds-subtree/server-config/src/main/resources/ (props changed) directory/apacheds/branches/apacheds-subtree/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (props changed) Propchange: directory/apacheds/branches/apacheds-subtree/server-config/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 22 07:42:35 2010 @@ -1,4 +1,4 @@ /directory/apacheds/branches/apacheds-replication/server-config:749790-764110 /directory/apacheds/branches/apacheds-schema/server-config:806623-896441 /directory/apacheds/branches/xdbm-refactoring/server-config:945827-946347 -/directory/apacheds/trunk/server-config:965704-966208 +/directory/apacheds/trunk/server-config:965704-966208,966529 Modified: directory/apacheds/branches/apacheds-subtree/server-config/pom.xml URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-subtree/server-config/pom.xml?rev=966530&r1=966529&r2=966530&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-subtree/server-config/pom.xml (original) +++ directory/apacheds/branches/apacheds-subtree/server-config/pom.xml Thu Jul 22 07:42:35 2010 @@ -25,7 +25,7 @@ 1.5.8-SNAPSHOT - apacheds-config + server-config ApacheDS Server Config Propchange: directory/apacheds/branches/apacheds-subtree/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 22 07:42:35 2010 @@ -1,4 +1,4 @@ /directory/apacheds/branches/apacheds-replication/core-annotations/src/main/java/org/apache/directory/server/core/factory/ConfigPartitionReader.java:749790-764110 /directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/factory/ConfigPartitionReader.java:806623-896441 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347 -/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:965704-966208 +/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:965704-966208,966529 Propchange: directory/apacheds/branches/apacheds-subtree/server-config/src/main/resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 22 07:42:35 2010 @@ -4,4 +4,4 @@ /directory/apacheds/branches/apacheds-schema/core-annotations/src/main/resources:806623-896441 /directory/apacheds/branches/apacheds-schema/default-config/src/main/resources:806623-896441 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347 -/directory/apacheds/trunk/server-config/src/main/resources:965704-966208 +/directory/apacheds/trunk/server-config/src/main/resources:965704-966208,966529 Propchange: directory/apacheds/branches/apacheds-subtree/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 22 07:42:35 2010 @@ -2,4 +2,4 @@ /directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/factory/CiDITDirectoryServiceFactory.java:806623-896441 /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:965704-966208 +/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:965704-966208,966529