You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/12/19 18:36:44 UTC
svn commit: r1423974 [2/6] - in
/directory/studio/branches/studio-refact/plugins:
aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/
aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/
aciitemed...
Modified: directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java (original)
+++ directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java Wed Dec 19 17:36:38 2012
@@ -24,12 +24,12 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.entry.Value;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Value;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueException;
import org.apache.directory.studio.apacheds.configuration.editor.v152.dialogs.AttributeValueDialog;
import org.apache.directory.studio.apacheds.configuration.editor.v152.dialogs.AttributeValueObject;
import org.apache.directory.studio.apacheds.configuration.editor.v152.dialogs.IndexedAttributeDialog;
Modified: directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java (original)
+++ directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java Wed Dec 19 17:36:38 2012
@@ -24,12 +24,12 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.entry.Value;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.DefaultAttribute;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Value;
+import org.apache.directory.api.ldap.model.exception.LdapException;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueException;
import org.apache.directory.studio.apacheds.configuration.editor.v153.dialogs.AttributeValueDialog;
import org.apache.directory.studio.apacheds.configuration.editor.v153.dialogs.AttributeValueObject;
import org.apache.directory.studio.apacheds.configuration.editor.v153.dialogs.IndexedAttributeDialog;
Modified: directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/AbstractServerXmlIO.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/AbstractServerXmlIO.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/AbstractServerXmlIO.java (original)
+++ directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/AbstractServerXmlIO.java Wed Dec 19 17:36:38 2012
@@ -26,10 +26,10 @@ import java.io.Reader;
import java.io.StringReader;
import java.util.Iterator;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.ldif.LdifReader;
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.ldif.LdifReader;
import org.apache.directory.api.util.Strings;
import org.apache.directory.studio.apacheds.configuration.StudioEntityResolver;
import org.dom4j.Document;
Modified: directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v150/Partition.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v150/Partition.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v150/Partition.java (original)
+++ directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v150/Partition.java Wed Dec 19 17:36:38 2012
@@ -23,8 +23,8 @@ package org.apache.directory.studio.apac
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.entry.Entry;
/**
Modified: directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v150/ServerXmlIOV150.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v150/ServerXmlIOV150.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v150/ServerXmlIOV150.java (original)
+++ directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v150/ServerXmlIOV150.java Wed Dec 19 17:36:38 2012
@@ -28,10 +28,10 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.entry.Value;
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Value;
import org.apache.directory.studio.apacheds.configuration.StudioEntityResolver;
import org.apache.directory.studio.apacheds.configuration.model.AbstractServerXmlIO;
import org.apache.directory.studio.apacheds.configuration.model.ServerConfiguration;
Modified: directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/Partition.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/Partition.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/Partition.java (original)
+++ directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/Partition.java Wed Dec 19 17:36:38 2012
@@ -23,8 +23,8 @@ package org.apache.directory.studio.apac
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.entry.Entry;
/**
Modified: directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerXmlIOV151.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerXmlIOV151.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerXmlIOV151.java (original)
+++ directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v151/ServerXmlIOV151.java Wed Dec 19 17:36:38 2012
@@ -28,10 +28,10 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.Value;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Value;
import org.apache.directory.studio.apacheds.configuration.StudioEntityResolver;
import org.apache.directory.studio.apacheds.configuration.model.AbstractServerXmlIO;
import org.apache.directory.studio.apacheds.configuration.model.ServerConfiguration;
Modified: directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/Partition.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/Partition.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/Partition.java (original)
+++ directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/Partition.java Wed Dec 19 17:36:38 2012
@@ -23,8 +23,8 @@ package org.apache.directory.studio.apac
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.entry.Entry;
/**
Modified: directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java (original)
+++ directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v152/ServerXmlIOV152.java Wed Dec 19 17:36:38 2012
@@ -28,9 +28,9 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.entry.Value;
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Value;
import org.apache.directory.studio.apacheds.configuration.StudioEntityResolver;
import org.apache.directory.studio.apacheds.configuration.model.AbstractServerXmlIO;
import org.apache.directory.studio.apacheds.configuration.model.ServerConfiguration;
Modified: directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/Partition.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/Partition.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/Partition.java (original)
+++ directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/Partition.java Wed Dec 19 17:36:38 2012
@@ -23,8 +23,8 @@ package org.apache.directory.studio.apac
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.DefaultEntry;
+import org.apache.directory.api.ldap.model.entry.Entry;
/**
Modified: directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java (original)
+++ directory/studio/branches/studio-refact/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/model/v153/ServerXmlIOV153.java Wed Dec 19 17:36:38 2012
@@ -28,9 +28,9 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
-import org.apache.directory.shared.ldap.model.entry.Value;
+import org.apache.directory.api.ldap.model.entry.Attribute;
+import org.apache.directory.api.ldap.model.entry.Entry;
+import org.apache.directory.api.ldap.model.entry.Value;
import org.apache.directory.studio.apacheds.configuration.StudioEntityResolver;
import org.apache.directory.studio.apacheds.configuration.model.AbstractServerXmlIO;
import org.apache.directory.studio.apacheds.configuration.model.ServerConfiguration;
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java Wed Dec 19 17:36:38 2012
@@ -21,9 +21,9 @@
package org.apache.directory.studio.connection.core;
-import org.apache.directory.shared.ldap.model.constants.SaslQoP;
-import org.apache.directory.shared.ldap.model.constants.SaslSecurityStrength;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.constants.SaslQoP;
+import org.apache.directory.api.ldap.model.constants.SaslSecurityStrength;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod;
import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
import org.apache.directory.studio.connection.core.ConnectionParameter.Krb5Configuration;
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionParameter.java Wed Dec 19 17:36:38 2012
@@ -28,8 +28,8 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import org.apache.directory.shared.ldap.model.constants.SaslQoP;
-import org.apache.directory.shared.ldap.model.constants.SaslSecurityStrength;
+import org.apache.directory.api.ldap.model.constants.SaslQoP;
+import org.apache.directory.api.ldap.model.constants.SaslSecurityStrength;
/**
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java Wed Dec 19 17:36:38 2012
@@ -22,9 +22,9 @@ package org.apache.directory.studio.conn
import javax.naming.InvalidNameException;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.name.Rdn;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.name.Rdn;
/**
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/IJndiLogger.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/IJndiLogger.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/IJndiLogger.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/IJndiLogger.java Wed Dec 19 17:36:38 2012
@@ -26,7 +26,7 @@ import javax.naming.directory.Modificati
import javax.naming.directory.SearchControls;
import javax.naming.ldap.Control;
-import org.apache.directory.shared.ldap.model.message.Referral;
+import org.apache.directory.api.ldap.model.message.Referral;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
import org.apache.directory.studio.connection.core.io.jndi.ReferralsInfo;
import org.apache.directory.studio.connection.core.io.jndi.StudioSearchResult;
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Utils.java Wed Dec 19 17:36:38 2012
@@ -27,9 +27,9 @@ import java.util.ResourceBundle;
import javax.naming.directory.SearchControls;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
import org.apache.directory.api.util.Strings;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java Wed Dec 19 17:36:38 2012
@@ -29,8 +29,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.directory.shared.ldap.model.constants.SaslQoP;
-import org.apache.directory.shared.ldap.model.constants.SaslSecurityStrength;
+import org.apache.directory.api.ldap.model.constants.SaslQoP;
+import org.apache.directory.api.ldap.model.constants.SaslSecurityStrength;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.ConnectionFolder;
import org.apache.directory.studio.connection.core.ConnectionParameter;
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapperUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapperUtils.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapperUtils.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionWrapperUtils.java Wed Dec 19 17:36:38 2012
@@ -22,7 +22,7 @@ package org.apache.directory.studio.conn
import java.util.ArrayList;
-import org.apache.directory.shared.ldap.model.message.Referral;
+import org.apache.directory.api.ldap.model.message.Referral;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java Wed Dec 19 17:36:38 2012
@@ -34,17 +34,17 @@ import javax.naming.ldap.BasicControl;
import javax.naming.ldap.Control;
import javax.naming.ldap.PagedResultsResponseControl;
+import org.apache.directory.api.ldap.model.cursor.SearchCursor;
+import org.apache.directory.api.ldap.model.entry.AttributeUtils;
+import org.apache.directory.api.ldap.model.message.Referral;
+import org.apache.directory.api.ldap.model.message.Response;
+import org.apache.directory.api.ldap.model.message.SearchResultDone;
+import org.apache.directory.api.ldap.model.message.SearchResultEntry;
+import org.apache.directory.api.ldap.model.message.SearchResultReference;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
import org.apache.directory.shared.ldap.codec.api.CodecControl;
import org.apache.directory.shared.ldap.codec.api.LdapApiService;
import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
-import org.apache.directory.shared.ldap.model.cursor.SearchCursor;
-import org.apache.directory.shared.ldap.model.entry.AttributeUtils;
-import org.apache.directory.shared.ldap.model.message.Referral;
-import org.apache.directory.shared.ldap.model.message.Response;
-import org.apache.directory.shared.ldap.model.message.SearchResultDone;
-import org.apache.directory.shared.ldap.model.message.SearchResultEntry;
-import org.apache.directory.shared.ldap.model.message.SearchResultReference;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -343,7 +343,7 @@ public class CursorStudioNamingEnumerati
{
if ( searchResultDone != null )
{
- Map<String, org.apache.directory.shared.ldap.model.message.Control> controlsMap = searchResultDone
+ Map<String, org.apache.directory.api.ldap.model.message.Control> controlsMap = searchResultDone
.getControls();
if ( ( controlsMap != null ) && ( controlsMap.size() > 0 ) )
{
@@ -363,16 +363,16 @@ public class CursorStudioNamingEnumerati
* @return
* an array of converted controls
*/
- private Control[] convertControls( Collection<org.apache.directory.shared.ldap.model.message.Control> controls )
+ private Control[] convertControls( Collection<org.apache.directory.api.ldap.model.message.Control> controls )
{
if ( controls != null )
{
List<Control> convertedControls = new ArrayList<Control>();
- for ( org.apache.directory.shared.ldap.model.message.Control control : controls )
+ for ( org.apache.directory.api.ldap.model.message.Control control : controls )
{
Control convertedControl = null;
- CodecControl<? extends org.apache.directory.shared.ldap.model.message.Control> wrapped = null;
+ CodecControl<? extends org.apache.directory.api.ldap.model.message.Control> wrapped = null;
if ( control instanceof CodecControl )
{
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java Wed Dec 19 17:36:38 2012
@@ -42,6 +42,35 @@ import javax.security.auth.login.AppConf
import javax.security.auth.login.Configuration;
import org.apache.commons.lang.StringUtils;
+import org.apache.directory.api.ldap.model.cursor.SearchCursor;
+import org.apache.directory.api.ldap.model.entry.AttributeUtils;
+import org.apache.directory.api.ldap.model.entry.DefaultModification;
+import org.apache.directory.api.ldap.model.entry.Modification;
+import org.apache.directory.api.ldap.model.entry.ModificationOperation;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidAttributeValueException;
+import org.apache.directory.api.ldap.model.message.AddRequest;
+import org.apache.directory.api.ldap.model.message.AddRequestImpl;
+import org.apache.directory.api.ldap.model.message.AddResponse;
+import org.apache.directory.api.ldap.model.message.AliasDerefMode;
+import org.apache.directory.api.ldap.model.message.BindRequest;
+import org.apache.directory.api.ldap.model.message.BindRequestImpl;
+import org.apache.directory.api.ldap.model.message.BindResponse;
+import org.apache.directory.api.ldap.model.message.DeleteRequest;
+import org.apache.directory.api.ldap.model.message.DeleteRequestImpl;
+import org.apache.directory.api.ldap.model.message.DeleteResponse;
+import org.apache.directory.api.ldap.model.message.LdapResult;
+import org.apache.directory.api.ldap.model.message.ModifyDnRequest;
+import org.apache.directory.api.ldap.model.message.ModifyDnRequestImpl;
+import org.apache.directory.api.ldap.model.message.ModifyDnResponse;
+import org.apache.directory.api.ldap.model.message.ModifyRequest;
+import org.apache.directory.api.ldap.model.message.ModifyRequestImpl;
+import org.apache.directory.api.ldap.model.message.ModifyResponse;
+import org.apache.directory.api.ldap.model.message.ResultCodeEnum;
+import org.apache.directory.api.ldap.model.message.ResultResponse;
+import org.apache.directory.api.ldap.model.message.SearchRequest;
+import org.apache.directory.api.ldap.model.message.SearchRequestImpl;
+import org.apache.directory.api.ldap.model.message.SearchScope;
+import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.ldap.client.api.CramMd5Request;
import org.apache.directory.ldap.client.api.DigestMd5Request;
import org.apache.directory.ldap.client.api.GssApiRequest;
@@ -50,35 +79,6 @@ import org.apache.directory.ldap.client.
import org.apache.directory.ldap.client.api.exception.InvalidConnectionException;
import org.apache.directory.shared.ldap.codec.api.DefaultConfigurableBinaryAttributeDetector;
import org.apache.directory.shared.ldap.codec.protocol.mina.LdapProtocolCodecActivator;
-import org.apache.directory.shared.ldap.model.cursor.SearchCursor;
-import org.apache.directory.shared.ldap.model.entry.AttributeUtils;
-import org.apache.directory.shared.ldap.model.entry.DefaultModification;
-import org.apache.directory.shared.ldap.model.entry.Modification;
-import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
-import org.apache.directory.shared.ldap.model.message.AddRequest;
-import org.apache.directory.shared.ldap.model.message.AddRequestImpl;
-import org.apache.directory.shared.ldap.model.message.AddResponse;
-import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.model.message.BindRequest;
-import org.apache.directory.shared.ldap.model.message.BindRequestImpl;
-import org.apache.directory.shared.ldap.model.message.BindResponse;
-import org.apache.directory.shared.ldap.model.message.DeleteRequest;
-import org.apache.directory.shared.ldap.model.message.DeleteRequestImpl;
-import org.apache.directory.shared.ldap.model.message.DeleteResponse;
-import org.apache.directory.shared.ldap.model.message.LdapResult;
-import org.apache.directory.shared.ldap.model.message.ModifyDnRequest;
-import org.apache.directory.shared.ldap.model.message.ModifyDnRequestImpl;
-import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
-import org.apache.directory.shared.ldap.model.message.ModifyRequest;
-import org.apache.directory.shared.ldap.model.message.ModifyRequestImpl;
-import org.apache.directory.shared.ldap.model.message.ModifyResponse;
-import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.model.message.ResultResponse;
-import org.apache.directory.shared.ldap.model.message.SearchRequest;
-import org.apache.directory.shared.ldap.model.message.SearchRequestImpl;
-import org.apache.directory.shared.ldap.model.message.SearchScope;
-import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
@@ -638,13 +638,13 @@ public class DirectoryApiConnectionWrapp
* @return
* an array of converted controls
*/
- private org.apache.directory.shared.ldap.model.message.Control[] convertControls( Control[] controls )
+ private org.apache.directory.api.ldap.model.message.Control[] convertControls( Control[] controls )
throws Exception
{
if ( controls != null )
{
- org.apache.directory.shared.ldap.model.message.Control[] returningControls =
- new org.apache.directory.shared.ldap.model.message.Control[controls.length];
+ org.apache.directory.api.ldap.model.message.Control[] returningControls =
+ new org.apache.directory.api.ldap.model.message.Control[controls.length];
for ( int i = 0; i < controls.length; i++ )
{
@@ -655,7 +655,7 @@ public class DirectoryApiConnectionWrapp
}
else
{
- return new org.apache.directory.shared.ldap.model.message.Control[0];
+ return new org.apache.directory.api.ldap.model.message.Control[0];
}
}
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java Wed Dec 19 17:36:38 2012
@@ -67,12 +67,12 @@ import javax.security.sasl.Sasl;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.directory.shared.ldap.model.constants.SaslQoP;
-import org.apache.directory.shared.ldap.model.constants.SaslSecurityStrength;
-import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.message.Referral;
-import org.apache.directory.shared.ldap.model.message.ReferralImpl;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.constants.SaslQoP;
+import org.apache.directory.api.ldap.model.constants.SaslSecurityStrength;
+import org.apache.directory.api.ldap.model.exception.LdapURLEncodingException;
+import org.apache.directory.api.ldap.model.message.Referral;
+import org.apache.directory.api.ldap.model.message.ReferralImpl;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JndiStudioNamingEnumeration.java Wed Dec 19 17:36:38 2012
@@ -33,9 +33,9 @@ import javax.naming.directory.SearchResu
import javax.naming.ldap.Control;
import javax.naming.ldap.LdapContext;
-import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.message.Referral;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.exception.LdapURLEncodingException;
+import org.apache.directory.api.ldap.model.message.Referral;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java Wed Dec 19 17:36:38 2012
@@ -47,10 +47,10 @@ import javax.naming.directory.Modificati
import javax.naming.directory.SearchControls;
import javax.naming.ldap.Control;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.message.Referral;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.name.Rdn;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.message.Referral;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.name.Rdn;
import org.apache.directory.api.util.Strings;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifSearchLogger.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifSearchLogger.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifSearchLogger.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifSearchLogger.java Wed Dec 19 17:36:38 2012
@@ -47,8 +47,8 @@ import javax.naming.directory.SearchCont
import javax.naming.ldap.Control;
import org.apache.commons.lang.StringUtils;
-import org.apache.directory.shared.ldap.model.message.Referral;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.message.Referral;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
import org.apache.directory.studio.connection.core.ConnectionCoreConstants;
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ReferralsInfo.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ReferralsInfo.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ReferralsInfo.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ReferralsInfo.java Wed Dec 19 17:36:38 2012
@@ -26,7 +26,7 @@ import java.util.Set;
import javax.naming.LinkLoopException;
-import org.apache.directory.shared.ldap.model.message.Referral;
+import org.apache.directory.api.ldap.model.message.Referral;
/**
Modified: directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioSearchResult.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioSearchResult.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioSearchResult.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioSearchResult.java Wed Dec 19 17:36:38 2012
@@ -22,7 +22,7 @@ package org.apache.directory.studio.conn
import javax.naming.directory.SearchResult;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
import org.apache.directory.studio.connection.core.Connection;
Modified: directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPage.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPage.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionParameterPage.java Wed Dec 19 17:36:38 2012
@@ -20,7 +20,7 @@
package org.apache.directory.studio.connection.ui;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
import org.apache.directory.studio.connection.core.ConnectionParameter;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.swt.widgets.Composite;
Modified: directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIReferralHandler.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIReferralHandler.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIReferralHandler.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIReferralHandler.java Wed Dec 19 17:36:38 2012
@@ -25,8 +25,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.exception.LdapURLEncodingException;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.core.IReferralHandler;
Modified: directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CopyAction.java Wed Dec 19 17:36:38 2012
@@ -25,8 +25,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCoreConstants;
import org.apache.directory.studio.connection.core.ConnectionFolder;
Modified: directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/PasteAction.java Wed Dec 19 17:36:38 2012
@@ -25,8 +25,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.StringUtils;
-import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.exception.LdapURLEncodingException;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCoreConstants;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
Modified: directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/SelectReferralConnectionDialog.java Wed Dec 19 17:36:38 2012
@@ -23,8 +23,8 @@ package org.apache.directory.studio.conn
import java.util.List;
-import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.exception.LdapURLEncodingException;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
Modified: directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/AuthenticationParameterPage.java Wed Dec 19 17:36:38 2012
@@ -22,10 +22,10 @@ package org.apache.directory.studio.conn
import org.apache.commons.lang.StringUtils;
-import org.apache.directory.shared.ldap.model.constants.SaslQoP;
-import org.apache.directory.shared.ldap.model.constants.SaslSecurityStrength;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
-import org.apache.directory.shared.ldap.model.url.LdapUrl.Extension;
+import org.apache.directory.api.ldap.model.constants.SaslQoP;
+import org.apache.directory.api.ldap.model.constants.SaslSecurityStrength;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.url.LdapUrl.Extension;
import org.apache.directory.studio.common.ui.HistoryUtils;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.Connection;
Modified: directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java (original)
+++ directory/studio/branches/studio-refact/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java Wed Dec 19 17:36:38 2012
@@ -25,8 +25,8 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.commons.lang.StringUtils;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
-import org.apache.directory.shared.ldap.model.url.LdapUrl.Extension;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.url.LdapUrl.Extension;
import org.apache.directory.studio.common.ui.HistoryUtils;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.Connection;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java Wed Dec 19 17:36:38 2012
@@ -24,7 +24,7 @@ package org.apache.directory.studio.ldap
import java.util.ArrayList;
import java.util.Collection;
-import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
import org.apache.directory.studio.ldapbrowser.core.model.schema.AttributeValueEditorRelation;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserSelectionUtils.java Wed Dec 19 17:36:38 2012
@@ -29,8 +29,8 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import org.apache.directory.shared.ldap.model.message.SearchScope;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.message.SearchScope;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.ui.actions.SelectionUtils;
import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/DeleteAction.java Wed Dec 19 17:36:38 2012
@@ -30,8 +30,8 @@ import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.connection.core.StudioControl;
import org.apache.directory.studio.ldapbrowser.common.dialogs.DeleteDialog;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RenameAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RenameAction.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RenameAction.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/RenameAction.java Wed Dec 19 17:36:38 2012
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.actions;
-import org.apache.directory.shared.ldap.model.name.Rdn;
+import org.apache.directory.api.ldap.model.name.Rdn;
import org.apache.directory.studio.ldapbrowser.common.dialogs.RenameEntryDialog;
import org.apache.directory.studio.ldapbrowser.common.dialogs.SimulateRenameDialogImpl;
import org.apache.directory.studio.ldapbrowser.core.jobs.RenameEntryRunnable;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/DnDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/DnDialog.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/DnDialog.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/DnDialog.java Wed Dec 19 17:36:38 2012
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.dialogs;
-import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/EntryExistsCopyStrategyDialogImpl.java Wed Dec 19 17:36:38 2012
@@ -21,8 +21,8 @@
package org.apache.directory.studio.ldapbrowser.common.dialogs;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.name.Rdn;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.name.Rdn;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.widgets.DnBuilderWidget;
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/MoveEntriesDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/MoveEntriesDialog.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/MoveEntriesDialog.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/MoveEntriesDialog.java Wed Dec 19 17:36:38 2012
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.dialogs;
-import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.widgets.DnBuilderWidget;
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/RenameEntryDialog.java Wed Dec 19 17:36:38 2012
@@ -24,8 +24,8 @@ package org.apache.directory.studio.ldap
import java.util.Collection;
import org.apache.commons.lang.ArrayUtils;
-import org.apache.directory.shared.ldap.model.name.Rdn;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.name.Rdn;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.widgets.DnBuilderWidget;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/ScopeDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/ScopeDialog.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/ScopeDialog.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/ScopeDialog.java Wed Dec 19 17:36:38 2012
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.dialogs;
-import org.apache.directory.shared.ldap.model.message.SearchScope;
+import org.apache.directory.api.ldap.model.message.SearchScope;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SimulateRenameDialogImpl.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SimulateRenameDialogImpl.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SimulateRenameDialogImpl.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SimulateRenameDialogImpl.java Wed Dec 19 17:36:38 2012
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.dialogs;
-import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.core.jobs.SimulateRenameDialog;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/BinaryAttributesAndSyntaxesPreferencePage.java Wed Dec 19 17:36:38 2012
@@ -28,8 +28,8 @@ import java.util.List;
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.LdapSyntax;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.Utils;
import org.apache.directory.studio.ldapbrowser.core.BrowserConnectionManager;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java Wed Dec 19 17:36:38 2012
@@ -30,8 +30,8 @@ import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.LdapSyntax;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.core.BrowserConnectionManager;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/EntryTransfer.java Wed Dec 19 17:36:38 2012
@@ -29,7 +29,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserConnectionManager;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
@@ -130,7 +130,7 @@ public class EntryTransfer extends ByteA
* This implementation just converts the platform specific representation
* to the connection id and entry Dn and invokes
* {@link BrowserConnectionManager#getBrowserConnectionById(String)} to get the
- * {@link IBrowserConnection} object and {@link IBrowserConnection#getEntryFromCache(org.apache.directory.shared.ldap.model.name.Dn)}
+ * {@link IBrowserConnection} object and {@link IBrowserConnection#getEntryFromCache(org.apache.directory.api.ldap.model.name.Dn)}
* to get the {@link IEntry} object.
*/
public Object nativeToJava( TransferData transferData )
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dnd/ValuesTransfer.java Wed Dec 19 17:36:38 2012
@@ -29,7 +29,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.shared.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java Wed Dec 19 17:36:38 2012
@@ -30,10 +30,10 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
-import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.MatchingRule;
+import org.apache.directory.api.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.core.model.filter.LdapFilter;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java Wed Dec 19 17:36:38 2012
@@ -21,10 +21,10 @@
package org.apache.directory.studio.ldapbrowser.common.filtereditor;
-import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
-import org.apache.directory.shared.ldap.model.schema.ObjectClass;
+import org.apache.directory.api.ldap.model.constants.SchemaConstants;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.schema.MatchingRule;
+import org.apache.directory.api.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.ldapbrowser.core.model.filter.LdapFilter;
import org.apache.directory.studio.ldapbrowser.core.model.filter.LdapFilterExtensibleComponent;
import org.apache.directory.studio.ldapbrowser.core.model.filter.LdapFilterItemComponent;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/DnBuilderWidget.java Wed Dec 19 17:36:38 2012
@@ -25,10 +25,10 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
-import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.model.name.Ava;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.name.Rdn;
+import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.api.ldap.model.name.Ava;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.name.Rdn;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.DnUtils;
import org.apache.directory.studio.connection.ui.widgets.ExtendedContentAssistCommandAdapter;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserLabelProvider.java Wed Dec 19 17:36:38 2012
@@ -23,8 +23,8 @@ package org.apache.directory.studio.ldap
import java.util.Collection;
-import org.apache.directory.shared.ldap.model.schema.ObjectClass;
-import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
+import org.apache.directory.api.ldap.model.schema.ObjectClass;
+import org.apache.directory.api.ldap.model.schema.ObjectClassTypeEnum;
import org.apache.directory.studio.connection.core.Utils;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserQuickSearchWidget.java Wed Dec 19 17:36:38 2012
@@ -24,8 +24,8 @@ package org.apache.directory.studio.ldap
import java.util.Arrays;
import java.util.Collection;
-import org.apache.directory.shared.ldap.model.message.SearchScope;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.api.ldap.model.message.SearchScope;
+import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.studio.common.ui.HistoryUtils;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.ui.widgets.ExtendedContentAssistCommandAdapter;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserSorter.java Wed Dec 19 17:36:38 2012
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
import java.math.BigInteger;
-import org.apache.directory.shared.ldap.model.name.Rdn;
+import org.apache.directory.api.ldap.model.name.Rdn;
import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/BrowserParameterPage.java Wed Dec 19 17:36:38 2012
@@ -24,9 +24,9 @@ package org.apache.directory.studio.ldap
import java.util.List;
import org.apache.commons.lang.StringUtils;
-import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
-import org.apache.directory.shared.ldap.model.url.LdapUrl.Extension;
+import org.apache.directory.api.ldap.model.name.Dn;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.url.LdapUrl.Extension;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionParameter;
Modified: directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/EditorParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/EditorParameterPage.java?rev=1423974&r1=1423973&r2=1423974&view=diff
==============================================================================
--- directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/EditorParameterPage.java (original)
+++ directory/studio/branches/studio-refact/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/connection/EditorParameterPage.java Wed Dec 19 17:36:38 2012
@@ -21,8 +21,8 @@
package org.apache.directory.studio.ldapbrowser.common.widgets.connection;
-import org.apache.directory.shared.ldap.model.url.LdapUrl;
-import org.apache.directory.shared.ldap.model.url.LdapUrl.Extension;
+import org.apache.directory.api.ldap.model.url.LdapUrl;
+import org.apache.directory.api.ldap.model.url.LdapUrl.Extension;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.ConnectionParameter;
import org.apache.directory.studio.connection.ui.AbstractConnectionParameterPage;