Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 63464 invoked from network); 6 Oct 2010 14:17:42 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Oct 2010 14:17:42 -0000 Received: (qmail 34562 invoked by uid 500); 6 Oct 2010 14:17:42 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 34504 invoked by uid 500); 6 Oct 2010 14:17:41 -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 34497 invoked by uid 99); 6 Oct 2010 14:17:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Oct 2010 14:17:41 +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; Wed, 06 Oct 2010 14:17:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2527D23889BF; Wed, 6 Oct 2010 14:17:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1005049 - in /directory/studio/branches/shared-trunk-merge/plugins/connection.ui: pom.xml src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java Date: Wed, 06 Oct 2010 14:17:21 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101006141721.2527D23889BF@eris.apache.org> Author: pamarcelot Date: Wed Oct 6 14:17:20 2010 New Revision: 1005049 URL: http://svn.apache.org/viewvc?rev=1005049&view=rev Log: Fixed 'connection.ui' module. Modified: directory/studio/branches/shared-trunk-merge/plugins/connection.ui/pom.xml directory/studio/branches/shared-trunk-merge/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java Modified: directory/studio/branches/shared-trunk-merge/plugins/connection.ui/pom.xml URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/connection.ui/pom.xml?rev=1005049&r1=1005048&r2=1005049&view=diff ============================================================================== --- directory/studio/branches/shared-trunk-merge/plugins/connection.ui/pom.xml (original) +++ directory/studio/branches/shared-trunk-merge/plugins/connection.ui/pom.xml Wed Oct 6 14:17:20 2010 @@ -115,7 +115,7 @@ org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}", org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}", - org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.version}", + org.apache.directory.shared.ldap;bundle-version="${org.apache.directory.shared.validversion}", org.apache.directory.studio.common.core, org.apache.directory.studio.common.ui, org.apache.directory.studio.connection.core, Modified: directory/studio/branches/shared-trunk-merge/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java?rev=1005049&r1=1005048&r2=1005049&view=diff ============================================================================== --- directory/studio/branches/shared-trunk-merge/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java (original) +++ directory/studio/branches/shared-trunk-merge/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java Wed Oct 6 14:17:20 2010 @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.directory.shared.ldap.name.LdapDN; +import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.util.LdapURL; import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.connection.core.ConnectionCoreConstants; @@ -195,7 +195,7 @@ public class CopyAction extends StudioAc { ConnectionParameter parameter = connection.getConnectionParameter(); LdapURL ldapUrl = new LdapURL(); - ldapUrl.setDn( LdapDN.EMPTY_LDAPDN ); + ldapUrl.setDn( DN.EMPTY_DN); for ( ConnectionParameterPage connectionParameterPage : connectionParameterPages ) { connectionParameterPage.mergeParametersToLdapURL( parameter, ldapUrl );