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 386E1D834 for ; Fri, 4 Jan 2013 13:20:11 +0000 (UTC) Received: (qmail 67559 invoked by uid 500); 4 Jan 2013 13:20:10 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 67513 invoked by uid 500); 4 Jan 2013 13:20: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 67498 invoked by uid 99); 4 Jan 2013 13:20:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Jan 2013 13:20:10 +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, 04 Jan 2013 13:20:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8775323888CD; Fri, 4 Jan 2013 13:19:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1428837 - in /directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor: ReplicationDetailsPage.java ReplicationMasterDetailsBlock.java Date: Fri, 04 Jan 2013 13:19:47 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130104131947.8775323888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Fri Jan 4 13:19:47 2013 New Revision: 1428837 URL: http://svn.apache.org/viewvc?rev=1428837&view=rev Log: Removed the '+' attribute (All operational attributes) from the list of the replicated attributes as it is mandatory for the replication and automatically added by the server. Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationDetailsPage.java directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationMasterDetailsBlock.java Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationDetailsPage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationDetailsPage.java?rev=1428837&r1=1428836&r2=1428837&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationDetailsPage.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationDetailsPage.java Fri Jan 4 13:19:47 2013 @@ -1150,6 +1150,12 @@ public class ReplicationDetailsPage impl allAttributesCheckbox.setSelection( false ); } + // All Operational Attributes + if ( attributesList.contains( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES ) ) + { + attributesList.remove( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES ); + } + attributesTableViewer.refresh(); } Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationMasterDetailsBlock.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationMasterDetailsBlock.java?rev=1428837&r1=1428836&r2=1428837&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationMasterDetailsBlock.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ReplicationMasterDetailsBlock.java Fri Jan 4 13:19:47 2013 @@ -269,7 +269,6 @@ public class ReplicationMasterDetailsBlo consumerBean.setReplRefreshInterval( 60 * 1000 ); consumerBean.setReplRefreshNPersist( true ); consumerBean.addReplAttributes( SchemaConstants.ALL_USER_ATTRIBUTES ); - consumerBean.addReplAttributes( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES ); consumerBean.setSearchBaseDn( "dc=example,dc=com" ); return consumerBean;