Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 96778 invoked from network); 17 Sep 2008 09:16:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Sep 2008 09:16:11 -0000 Received: (qmail 90120 invoked by uid 500); 17 Sep 2008 09:16:08 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 90084 invoked by uid 500); 17 Sep 2008 09:16:08 -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 90075 invoked by uid 99); 17 Sep 2008 09:16:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Sep 2008 02:16:08 -0700 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; Wed, 17 Sep 2008 09:15:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A020E23889FD; Wed, 17 Sep 2008 02:15:20 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r696211 - in /directory: apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/ shared/trunk/ldap/src/main/java/org/apache/directory/... Date: Wed, 17 Sep 2008 09:15:18 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080917091520.A020E23889FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Wed Sep 17 02:15:17 2008 New Revision: 696211 URL: http://svn.apache.org/viewvc?rev=696211&view=rev Log: o Removed the LdifComposer(Impl) classes, as they are a duplicate of some LdifUtils methods This will also fix DIRSERVER-666, as LdifUtils.convertToLdif() methods can fold the lines to a specified length (default to 80) Removed: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposer.java directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/ldif/LdifComposerImpl.java Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java Modified: directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java?rev=696211&r1=696210&r2=696211&view=diff ============================================================================== --- directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java (original) +++ directory/apacheds/trunk/core-entry/src/main/java/org/apache/directory/server/core/entry/ServerEntryPropertyEditor.java Wed Sep 17 02:15:17 2008 @@ -24,18 +24,14 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; -import java.util.Map; -import javax.naming.NamingEnumeration; import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.BasicAttributes; -import org.apache.commons.collections.map.MultiValueMap; -import org.apache.directory.shared.ldap.ldif.LdifComposer; -import org.apache.directory.shared.ldap.ldif.LdifComposerImpl; import org.apache.directory.shared.ldap.ldif.LdifReader; +import org.apache.directory.shared.ldap.ldif.LdifUtils; import org.apache.directory.shared.ldap.util.StringTools; @@ -72,28 +68,11 @@ */ public String getAsText() { - LdifComposer composer = new LdifComposerImpl(); - Map map = new MultiValueMap(); - Attributes attrs = (Attributes) getValue(); try { - NamingEnumeration e = attrs.getAll(); - - while ( e.hasMore() ) - { - Attribute attr = e.next(); - NamingEnumeration e2 = attr.getAll(); - - while ( e2.hasMoreElements() ) - { - Object value = e2.next(); - map.put( attr.getID(), value ); - } - } - - return composer.compose( map ); + return LdifUtils.convertToLdif( attrs ); } catch ( Exception e ) { Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java?rev=696211&r1=696210&r2=696211&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/configuration/AttributesPropertyEditor.java Wed Sep 17 02:15:17 2008 @@ -19,27 +19,22 @@ */ package org.apache.directory.server.core.configuration; -import org.apache.commons.collections.map.MultiValueMap; import org.apache.directory.server.core.DirectoryService; import org.apache.directory.shared.ldap.entry.Entry; import org.apache.directory.shared.ldap.entry.EntryAttribute; import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry; -import org.apache.directory.shared.ldap.ldif.LdifComposer; -import org.apache.directory.shared.ldap.ldif.LdifComposerImpl; import org.apache.directory.shared.ldap.ldif.LdifReader; +import org.apache.directory.shared.ldap.ldif.LdifUtils; import org.apache.directory.shared.ldap.util.AttributeUtils; import org.apache.directory.shared.ldap.util.StringTools; -import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import java.beans.PropertyEditor; import java.beans.PropertyEditorSupport; import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; -import java.util.Map; /** @@ -76,25 +71,11 @@ @SuppressWarnings("deprecation") public String getAsText() { - LdifComposer composer = new LdifComposerImpl(); - Map map = new MultiValueMap(); - Attributes attrs = (Attributes) getValue(); + try { - NamingEnumeration e = attrs.getAll(); - while ( e.hasMore() ) - { - Attribute attr = e.next(); - NamingEnumeration e2 = attr.getAll(); - while ( e2.hasMoreElements() ) - { - Object value = e2.next(); - map.put( attr.getID(), value ); - } - } - - return composer.compose( map ); + return LdifUtils.convertToLdif( attrs ); } catch ( Exception e ) {