You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/10/06 16:17:21 UTC
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
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 @@
<Require-Bundle>
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 );