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 52D0E82A1 for ; Fri, 12 Aug 2011 10:01:27 +0000 (UTC) Received: (qmail 491 invoked by uid 500); 12 Aug 2011 10:01:24 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 204 invoked by uid 500); 12 Aug 2011 10:01:14 -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 99889 invoked by uid 99); 12 Aug 2011 10:01:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Aug 2011 10:01:07 +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; Fri, 12 Aug 2011 10:01:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 56C6D2388AB9 for ; Fri, 12 Aug 2011 10:00:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1157029 - in /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication: ReplicaEventMessage.java SyncReplConsumer.java SyncReplSearchListener.java Date: Fri, 12 Aug 2011 10:00:43 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110812100043.56C6D2388AB9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Fri Aug 12 10:00:42 2011 New Revision: 1157029 URL: http://svn.apache.org/viewvc?rev=1157029&view=rev Log: Fixed compilation failures Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java?rev=1157029&r1=1157028&r2=1157029&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java Fri Aug 12 10:00:42 2011 @@ -163,7 +163,7 @@ public class ReplicaEventMessage impleme modDnControl.setDeleteOldRdn( in.readBoolean() ); break; - case MOVEANDRENAME: + case MOVE_AND_RENAME: modDnControl.setNewSuperiorDn( in.readUTF() ); modDnControl.setNewRdn( in.readUTF() ); modDnControl.setDeleteOldRdn( in.readBoolean() ); @@ -249,7 +249,7 @@ public class ReplicaEventMessage impleme out.writeBoolean( modDnControl.isDeleteOldRdn() ); break; - case MOVEANDRENAME: + case MOVE_AND_RENAME: out.writeUTF( modDnControl.getNewSuperiorDn() ); out.writeUTF( modDnControl.getNewRdn() ); out.writeBoolean( modDnControl.isDeleteOldRdn() ); Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java?rev=1157029&r1=1157028&r2=1157029&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java Fri Aug 12 10:00:42 2011 @@ -819,7 +819,7 @@ public class SyncReplConsumer implements session.rename( entryDn, newRdn, deleteOldRdn ); break; - case MOVEANDRENAME: + case MOVE_AND_RENAME: Dn newParentDn = directoryService.getDnFactory().create( modDnControl.getNewSuperiorDn() ); newRdn = new Rdn( schemaManager, modDnControl.getNewRdn() ); Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java?rev=1157029&r1=1157028&r2=1157029&view=diff ============================================================================== --- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java (original) +++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java Fri Aug 12 10:00:42 2011 @@ -370,7 +370,7 @@ public class SyncReplSearchListener impl } SyncModifyDnDecorator modDnControl = - new SyncModifyDnDecorator( directoryService.getLdapCodecService(), SyncModifyDnType.MOVEANDRENAME ); + new SyncModifyDnDecorator( directoryService.getLdapCodecService(), SyncModifyDnType.MOVE_AND_RENAME ); modDnControl.setEntryDn( moveAndRenameContext.getDn().getNormName() ); modDnControl.setNewSuperiorDn( moveAndRenameContext.getNewSuperiorDn().getNormName() ); modDnControl.setNewRdn( moveAndRenameContext.getNewRdn().getNormName() );