directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1030132 [2/2] - in /directory/studio/trunk: ./ plugins/connection.core/ plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io...
Date Tue, 02 Nov 2010 17:22:24 GMT
Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/messages.properties?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/messages.properties (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/messages.properties Tue Nov  2 17:22:19 2010
@@ -19,4 +19,4 @@ ConnectionParameterPageManager.UnableCre
 ConnectionUIPlugin.UnableGetPluginProperties=Unable to get the plugin properties.
 ExceptionHandler.Error=Error
 UIAuthHandler.EnterPasswordFor=Enter Password for "{0}"
-UIAuthHandler.PleaseEnterPasswordOfUser=Please enter password of user 
+UIAuthHandler.PleaseEnterPasswordOfUser=Please enter password of user "{0}":

Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/messages_de.properties?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/messages_de.properties (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/messages_de.properties Tue Nov  2 17:22:19 2010
@@ -19,4 +19,4 @@ ConnectionParameterPageManager.UnableCre
 ConnectionUIPlugin.UnableGetPluginProperties=Plugin Eigenschaften sind nicht auffindbar.
 ExceptionHandler.Error=Fehler
 UIAuthHandler.EnterPasswordFor=Passwort f\u00FCr "{0}" eingeben
-UIAuthHandler.PleaseEnterPasswordOfUser=Bitte Passwort f\u00FCr Benutzer eingeben
+UIAuthHandler.PleaseEnterPasswordOfUser=Bitte Passwort f\u00FCr Benutzer "{0}" eingeben:

Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/messages_fr.properties?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/messages_fr.properties (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/messages_fr.properties Tue Nov  2 17:22:19 2010
@@ -19,4 +19,4 @@ ConnectionParameterPageManager.UnableCre
 ConnectionUIPlugin.UnableGetPluginProperties=Impossible de r\u00E9cup\u00E9rer les propri\u00E9t\u00E9s du plugin
 ExceptionHandler.Error=Erreur
 UIAuthHandler.EnterPasswordFor=Veuillez entrer le mot de passe pour "{0}"
-UIAuthHandler.PleaseEnterPasswordOfUser=Veuillez entrer le mot de passe de l'utilisateur 
+UIAuthHandler.PleaseEnterPasswordOfUser=Veuillez entrer le mot de passe de l'utilisateur "{0}" :

Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionLabelProvider.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionLabelProvider.java (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionLabelProvider.java Tue Nov  2 17:22:19 2010
@@ -96,13 +96,13 @@ public class ConnectionLabelProvider ext
             if ( ( conn.getEncryptionMethod() == EncryptionMethod.LDAPS )
                 || ( conn.getEncryptionMethod() == EncryptionMethod.START_TLS ) )
             {
-                return conn.getJNDIConnectionWrapper().isConnected() ? ConnectionUIPlugin.getDefault().getImage(
+                return conn.getConnectionWrapper().isConnected() ? ConnectionUIPlugin.getDefault().getImage(
                     ConnectionUIConstants.IMG_CONNECTION_SSL_CONNECTED ) : ConnectionUIPlugin.getDefault().getImage(
                     ConnectionUIConstants.IMG_CONNECTION_SSL_DISCONNECTED );
             }
             else
             {
-                return conn.getJNDIConnectionWrapper().isConnected() ? ConnectionUIPlugin.getDefault().getImage(
+                return conn.getConnectionWrapper().isConnected() ? ConnectionUIPlugin.getDefault().getImage(
                     ConnectionUIConstants.IMG_CONNECTION_CONNECTED ) : ConnectionUIPlugin.getDefault().getImage(
                     ConnectionUIConstants.IMG_CONNECTION_DISCONNECTED );
             }

Modified: directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java (original)
+++ directory/studio/trunk/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/NetworkParameterPage.java Tue Nov  2 17:22:19 2010
@@ -33,6 +33,7 @@ import org.apache.directory.studio.conne
 import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
 import org.apache.directory.studio.connection.core.ConnectionParameter;
 import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
+import org.apache.directory.studio.connection.core.ConnectionParameter.NetworkProvider;
 import org.apache.directory.studio.connection.core.jobs.CheckNetworkParameterRunnable;
 import org.apache.directory.studio.connection.ui.AbstractConnectionParameterPage;
 import org.apache.directory.studio.connection.ui.ConnectionUIConstants;
@@ -64,7 +65,6 @@ import org.eclipse.swt.widgets.Text;
  */
 public class NetworkParameterPage extends AbstractConnectionParameterPage
 {
-
     private static final String X_CONNECTION_NAME = "X-CONNECTION-NAME"; //$NON-NLS-1$
 
     private static final String X_ENCRYPTION = "X-ENCRYPTION"; //$NON-NLS-1$
@@ -73,6 +73,12 @@ public class NetworkParameterPage extend
 
     private static final String X_ENCRYPTION_START_TLS = "StartTLS"; //$NON-NLS-1$
 
+    private static final String X_NETWORK_PROVIDER = "X-NETWORK-PROVIDER"; //$NON-NLS-1$
+
+    private static final String X_NETWORK_PROVIDER_JNDI = "JNDI"; //$NON-NLS-1$
+
+    private static final String X_NETWORK_PROVIDER_APACHE_DIRECTORY_LDAP_API = "ApacheDirectoryLdapApi"; //$NON-NLS-1$
+
     /** The connection name text widget */
     private Text nameText;
 
@@ -85,6 +91,9 @@ public class NetworkParameterPage extend
     /** The combo to select the encryption method */
     private Combo encryptionMethodCombo;
 
+    /** The combo to select the network provider */
+    private Combo networkProviderCombo;
+
     /** The button to check the connection parameters */
     private Button checkConnectionButton;
 
@@ -150,7 +159,24 @@ public class NetworkParameterPage extend
 
 
     /**
-     * Gets a temporary connection with all conection parameter 
+     * Gets the encyrption method.
+     * 
+     * @return the encyrption method
+     */
+    private ConnectionParameter.NetworkProvider getNetworkProvider()
+    {
+        switch ( networkProviderCombo.getSelectionIndex() )
+        {
+            case 1:
+                return ConnectionParameter.NetworkProvider.APACHE_DIRECTORY_LDAP_API;
+            default:
+                return ConnectionParameter.NetworkProvider.JNDI;
+        }
+    }
+
+
+    /**
+     * Gets a temporary connection with all connection parameter 
      * entered in this page. 
      *
      * @return a test connection
@@ -158,7 +184,7 @@ public class NetworkParameterPage extend
     private Connection getTestConnection()
     {
         ConnectionParameter cp = new ConnectionParameter( null, getHostName(), getPort(), getEncyrptionMethod(),
-            ConnectionParameter.AuthenticationMethod.NONE, null, null, null, true, null );
+            getNetworkProvider(), ConnectionParameter.AuthenticationMethod.NONE, null, null, null, true, null );
         Connection conn = new Connection( cp );
         return conn;
     }
@@ -208,6 +234,11 @@ public class NetworkParameterPage extend
                 .getString( "NetworkParameterPage.WarningCertificateValidation" ), 2 ); //$NON-NLS-1$
         }
 
+        String[] networkProviders = new String[]
+            { "JNDI (Java Naming and Directory Interface)", "Apache Directory LDAP Client API" }; //$NON-NLS-1$
+        BaseWidgetUtils.createLabel( groupComposite, "Provider:", 1 ); //$NON-NLS-1$
+        networkProviderCombo = BaseWidgetUtils.createReadonlyCombo( groupComposite, networkProviders, index, 2 );
+
         BaseWidgetUtils.createSpacer( groupComposite, 2 );
         checkConnectionButton = new Button( groupComposite, SWT.PUSH );
         GridData gd = new GridData();
@@ -263,9 +294,11 @@ public class NetworkParameterPage extend
         nameText.setText( parameter.getName() );
         hostCombo.setText( parameter.getHost() );
         portCombo.setText( Integer.toString( parameter.getPort() ) );
-        int index = parameter.getEncryptionMethod() == EncryptionMethod.LDAPS ? 1
+        int encryptionMethodIndex = parameter.getEncryptionMethod() == EncryptionMethod.LDAPS ? 1
             : parameter.getEncryptionMethod() == EncryptionMethod.START_TLS ? 2 : 0;
-        encryptionMethodCombo.select( index );
+        encryptionMethodCombo.select( encryptionMethodIndex );
+        int networkProviderIndex = parameter.getNetworkProvider() == NetworkProvider.JNDI ? 0 : 1;
+        networkProviderCombo.select( networkProviderIndex );
     }
 
 
@@ -316,6 +349,14 @@ public class NetworkParameterPage extend
             }
         } );
 
+        networkProviderCombo.addSelectionListener( new SelectionAdapter()
+        {
+            public void widgetSelected( SelectionEvent event )
+            {
+                connectionPageModified();
+            }
+        } );
+
         checkConnectionButton.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent event )
@@ -343,6 +384,7 @@ public class NetworkParameterPage extend
         parameter.setHost( getHostName() );
         parameter.setPort( getPort() );
         parameter.setEncryptionMethod( getEncyrptionMethod() );
+        parameter.setNetworkProvider( getNetworkProvider() );
     }
 
 
@@ -381,7 +423,8 @@ public class NetworkParameterPage extend
     {
         return connectionParameter == null || !StringUtils.equals( connectionParameter.getHost(), getHostName() )
             || connectionParameter.getPort() != getPort()
-            || connectionParameter.getEncryptionMethod() != getEncyrptionMethod();
+            || connectionParameter.getEncryptionMethod() != getEncyrptionMethod()
+            || connectionParameter.getNetworkProvider() != getNetworkProvider();
     }
 
 
@@ -408,6 +451,17 @@ public class NetworkParameterPage extend
                 ldapUrl.getExtensions().add( new Extension( false, X_ENCRYPTION, X_ENCRYPTION_START_TLS ) );
                 break;
         }
+
+        switch ( parameter.getNetworkProvider() )
+        {
+            case JNDI:
+                ldapUrl.getExtensions().add( new Extension( false, X_NETWORK_PROVIDER, X_NETWORK_PROVIDER_JNDI ) );
+                break;
+            case APACHE_DIRECTORY_LDAP_API:
+                ldapUrl.getExtensions().add(
+                    new Extension( false, X_NETWORK_PROVIDER, X_NETWORK_PROVIDER_APACHE_DIRECTORY_LDAP_API ) );
+                break;
+        }
     }
 
 
@@ -444,5 +498,17 @@ public class NetworkParameterPage extend
         {
             parameter.setEncryptionMethod( ConnectionParameter.EncryptionMethod.NONE );
         }
+
+        // encryption method, none if unknown or absent 
+        String networkProvider = ldapUrl.getExtensionValue( X_NETWORK_PROVIDER );
+        if ( StringUtils.isNotEmpty( encryption ) && X_NETWORK_PROVIDER_JNDI.equalsIgnoreCase( networkProvider ) )
+        {
+            parameter.setNetworkProvider( ConnectionParameter.NetworkProvider.JNDI );
+        }
+        else if ( StringUtils.isNotEmpty( encryption )
+            && X_NETWORK_PROVIDER_APACHE_DIRECTORY_LDAP_API.equalsIgnoreCase( networkProvider ) )
+        {
+            parameter.setNetworkProvider( ConnectionParameter.NetworkProvider.APACHE_DIRECTORY_LDAP_API );
+        }
     }
 }

Modified: directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java Tue Nov  2 17:22:19 2010
@@ -502,7 +502,7 @@ public class BrowserContentProvider impl
                 {
                     // open connection when expanding DIT
                     if ( browserConnection.getConnection() != null
-                        && !browserConnection.getConnection().getJNDIConnectionWrapper().isConnected() )
+                        && !browserConnection.getConnection().getConnectionWrapper().isConnected() )
                     {
                         new StudioBrowserJob( new OpenConnectionsRunnable( browserConnection.getConnection() ) )
                             .execute();

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java Tue Nov  2 17:22:19 2010
@@ -143,7 +143,7 @@ public class BrowserConnectionListener i
 
         if ( browserConnection.getConnection() != null )
         {
-            browserConnection.getConnection().getJNDIConnectionWrapper().setBinaryAttributes( binaryAttributeNames );
+            browserConnection.getConnection().getConnectionWrapper().setBinaryAttributes( binaryAttributeNames );
         }
     }
 

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java Tue Nov  2 17:22:19 2010
@@ -237,7 +237,7 @@ public class CopyEntriesRunnable impleme
         NamingEnumeration<SearchResult> result = entryToCopy
             .getBrowserConnection()
             .getConnection()
-            .getJNDIConnectionWrapper()
+            .getConnectionWrapper()
             .search( entryToCopy.getDn().getName(), ISearch.FILTER_TRUE, searchControls,
                 AliasDereferencingMethod.NEVER, ReferralHandlingMethod.IGNORE, controls, monitor, null );
 
@@ -312,7 +312,7 @@ public class CopyEntriesRunnable impleme
                 }
 
                 // create entry
-                targetBrowserConnection.getConnection().getJNDIConnectionWrapper()
+                targetBrowserConnection.getConnection().getConnectionWrapper()
                     .createEntry( newLdapDn.getName(), newAttributes, controls, dummyMonitor, null );
 
                 while ( dummyMonitor.errorsReported() )
@@ -352,7 +352,7 @@ public class CopyEntriesRunnable impleme
                                     // modify entry
                                     targetBrowserConnection
                                         .getConnection()
-                                        .getJNDIConnectionWrapper()
+                                        .getConnectionWrapper()
                                         .modifyEntry( newLdapDn.getName(),
                                             mis.toArray( new ModificationItem[mis.size()] ), null, dummyMonitor, null );
 
@@ -375,7 +375,7 @@ public class CopyEntriesRunnable impleme
                                     newLdapDn = DnUtils.composeDn( renamedRdn, parentDn );
 
                                     // create entry
-                                    targetBrowserConnection.getConnection().getJNDIConnectionWrapper()
+                                    targetBrowserConnection.getConnection().getConnectionWrapper()
                                         .createEntry( newLdapDn.getName(), newAttributes, null, dummyMonitor, null );
 
                                     break;
@@ -412,7 +412,7 @@ public class CopyEntriesRunnable impleme
                         searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
                         NamingEnumeration<SearchResult> childEntries = sourceBrowserConnection
                             .getConnection()
-                            .getJNDIConnectionWrapper()
+                            .getConnectionWrapper()
                             .search( oldLdapDn.getName(), ISearch.FILTER_TRUE, searchControls,
                                 AliasDereferencingMethod.NEVER, ReferralHandlingMethod.IGNORE, null, monitor, null );
 

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java Tue Nov  2 17:22:19 2010
@@ -180,7 +180,7 @@ public class CreateEntryRunnable impleme
 
 
     /**
-     * Creates the entry using the underlying JNDI connection wrapper.
+     * Creates the entry using the underlying connection wrapper.
      * 
      * @param browserConnection the browser connection
      * @param entryToCreate the entry to create
@@ -221,7 +221,7 @@ public class CreateEntryRunnable impleme
                 { new ManageReferralControl( false ) };
         }
 
-        browserConnection.getConnection().getJNDIConnectionWrapper()
+        browserConnection.getConnection().getConnectionWrapper()
             .createEntry( dn, jndiAttributes, controls, monitor, null );
     }
 }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java Tue Nov  2 17:22:19 2010
@@ -297,7 +297,7 @@ public class DeleteEntriesRunnable imple
                 searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
                 NamingEnumeration<SearchResult> result = browserConnection
                     .getConnection()
-                    .getJNDIConnectionWrapper()
+                    .getConnectionWrapper()
                     .search( dn.getName(), ISearch.FILTER_TRUE, searchControls, aliasDereferencingMethod,
                         referralsHandlingMethod, null, dummyMonitor, null );
 
@@ -379,7 +379,7 @@ public class DeleteEntriesRunnable imple
         // delete entry
         if ( browserConnection.getConnection() != null )
         {
-            browserConnection.getConnection().getJNDIConnectionWrapper()
+            browserConnection.getConnection().getConnectionWrapper()
                 .deleteEntry( dn.getName(), controls, monitor, null );
         }
     }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java Tue Nov  2 17:22:19 2010
@@ -57,7 +57,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.util.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.io.jndi.StudioNamingEnumeration;
+import org.apache.directory.studio.connection.core.io.StudioNamingEnumeration;
 import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifRunnable.java Tue Nov  2 17:22:19 2010
@@ -42,7 +42,7 @@ import org.apache.directory.studio.commo
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.connection.core.StudioControl;
 import org.apache.directory.studio.connection.core.StudioPagedResultsControl;
-import org.apache.directory.studio.connection.core.io.jndi.StudioNamingEnumeration;
+import org.apache.directory.studio.connection.core.io.StudioNamingEnumeration;
 import org.apache.directory.studio.connection.core.jobs.StudioConnectionRunnableWithProgress;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java Tue Nov  2 17:22:19 2010
@@ -71,7 +71,7 @@ import org.apache.directory.studio.conne
 import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
 import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
 import org.apache.directory.studio.connection.core.DnUtils;
-import org.apache.directory.studio.connection.core.io.jndi.StudioNamingEnumeration;
+import org.apache.directory.studio.connection.core.io.StudioNamingEnumeration;
 import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 import org.apache.directory.studio.ldapbrowser.core.events.BulkModificationEvent;
@@ -350,7 +350,7 @@ public class ImportDsmlRunnable implemen
         Entry entry = request.getEntry();
         browserConnection
             .getConnection()
-            .getJNDIConnectionWrapper()
+            .getConnectionWrapper()
             .createEntry( entry.getDn().getName(), AttributeUtils.toAttributes( entry ), getControls( request ),
                 monitor, null );
 
@@ -418,7 +418,7 @@ public class ImportDsmlRunnable implemen
         StudioProgressMonitor monitor )
     {
         // Executing the del request
-        browserConnection.getConnection().getJNDIConnectionWrapper()
+        browserConnection.getConnection().getConnectionWrapper()
             .deleteEntry( request.getName().getName(), getControls( request ), monitor, null );
 
         // Creating the response
@@ -496,7 +496,7 @@ public class ImportDsmlRunnable implemen
         // Executing the modify request
         browserConnection
             .getConnection()
-            .getJNDIConnectionWrapper()
+            .getConnectionWrapper()
             .modifyEntry( request.getName().getName(), modificationItems.toArray( new ModificationItem[0] ),
                 getControls( request ), monitor, null );
 
@@ -557,7 +557,7 @@ public class ImportDsmlRunnable implemen
         // Executing the modify DN request
         browserConnection
             .getConnection()
-            .getJNDIConnectionWrapper()
+            .getConnectionWrapper()
             .renameEntry( request.getName().getName(), request.getNewRdn().getName(), request.getDeleteOldRdn(),
                 getControls( request ), monitor, null );
 
@@ -617,7 +617,7 @@ public class ImportDsmlRunnable implemen
             // [Optimization] We're only searching if we need to produce a response
             StudioNamingEnumeration ne = browserConnection
                 .getConnection()
-                .getJNDIConnectionWrapper()
+                .getConnectionWrapper()
                 .search( request.getBase().getName(), request.getFilter().toString(),
                     getSearchControls( request ), getAliasDereferencingMethod( request ),
                     ReferralHandlingMethod.IGNORE, getControls( request ), monitor, null );

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java Tue Nov  2 17:22:19 2010
@@ -461,7 +461,7 @@ public class ImportLdifRunnable implemen
                 }
             }
 
-            browserConnection.getConnection().getJNDIConnectionWrapper()
+            browserConnection.getConnection().getConnectionWrapper()
                 .createEntry( dn, jndiAttributes, getControls( record ), monitor, null );
 
             if ( monitor.errorsReported() && updateIfEntryExists
@@ -471,14 +471,14 @@ public class ImportLdifRunnable implemen
                 monitor.reset();
 
                 ModificationItem[] mis = ModelConverter.entryToReplaceModificationItems( dummyEntry );
-                browserConnection.getConnection().getJNDIConnectionWrapper()
+                browserConnection.getConnection().getConnectionWrapper()
                     .modifyEntry( dn, mis, getControls( record ), monitor, null );
             }
         }
         else if ( record instanceof LdifChangeDeleteRecord )
         {
             LdifChangeDeleteRecord changeDeleteRecord = ( LdifChangeDeleteRecord ) record;
-            browserConnection.getConnection().getJNDIConnectionWrapper()
+            browserConnection.getConnection().getConnectionWrapper()
                 .deleteEntry( dn, getControls( changeDeleteRecord ), monitor, null );
         }
         else if ( record instanceof LdifChangeModifyRecord )
@@ -511,7 +511,7 @@ public class ImportLdifRunnable implemen
                 }
             }
 
-            browserConnection.getConnection().getJNDIConnectionWrapper()
+            browserConnection.getConnection().getConnectionWrapper()
                 .modifyEntry( dn, mis, getControls( modifyRecord ), monitor, null );
         }
         else if ( record instanceof LdifChangeModDnRecord )
@@ -534,7 +534,7 @@ public class ImportLdifRunnable implemen
                     newDn = DnUtils.composeDn( newRdn, parent.getName() );
                 }
 
-                browserConnection.getConnection().getJNDIConnectionWrapper()
+                browserConnection.getConnection().getConnectionWrapper()
                     .renameEntry( dn, newDn.toString(), deleteOldRdn, getControls( modDnRecord ), monitor, null );
             }
         }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java Tue Nov  2 17:22:19 2010
@@ -292,7 +292,7 @@ public class RenameEntryRunnable impleme
 
         if ( browserConnection.getConnection() != null )
         {
-            browserConnection.getConnection().getJNDIConnectionWrapper()
+            browserConnection.getConnection().getConnectionWrapper()
                 .renameEntry( oldDnString, newDnString, true, controls, monitor, null );
         }
     }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java Tue Nov  2 17:22:19 2010
@@ -48,7 +48,7 @@ import org.apache.directory.studio.conne
 import org.apache.directory.studio.connection.core.DnUtils;
 import org.apache.directory.studio.connection.core.StudioControl;
 import org.apache.directory.studio.connection.core.StudioPagedResultsControl;
-import org.apache.directory.studio.connection.core.io.jndi.StudioNamingEnumeration;
+import org.apache.directory.studio.connection.core.io.StudioNamingEnumeration;
 import org.apache.directory.studio.connection.core.io.jndi.StudioSearchResult;
 import org.apache.directory.studio.connection.core.jobs.StudioConnectionBulkRunnableWithProgress;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
@@ -320,7 +320,7 @@ public class SearchRunnable implements S
                     // iterate through the search result
                     while ( !monitor.isCanceled() && enumeration != null && enumeration.hasMore() )
                     {
-                        StudioSearchResult sr = enumeration.next();
+                        StudioSearchResult sr = ( StudioSearchResult ) enumeration.next();
                         boolean isContinuedSearchResult = sr.isContinuedSearchResult();
                         LdapURL searchContinuationUrl = sr.getSearchContinuationUrl();
 
@@ -497,7 +497,7 @@ public class SearchRunnable implements S
 
         StudioNamingEnumeration result = browserConnection
             .getConnection()
-            .getJNDIConnectionWrapper()
+            .getConnectionWrapper()
             .search( searchBase, filter, controls, aliasesDereferencingMethod, referralsHandlingMethod, jndiControls,
                 monitor, null );
         return result;

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ContinuedSearchResultEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ContinuedSearchResultEntry.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ContinuedSearchResultEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/ContinuedSearchResultEntry.java Tue Nov  2 17:22:19 2010
@@ -147,8 +147,8 @@ public class ContinuedSearchResultEntry 
     public void resolve()
     {
         // get referral connection, exit if canceled
-        List<LdapURL> urls = new ArrayList<LdapURL>();
-        urls.add( url );
+        List<String> urls = new ArrayList<String>();
+        urls.add( url.toString() );
         Connection referralConnection = ConnectionCorePlugin.getDefault().getReferralHandler().getReferralConnection(
             urls );
         if ( referralConnection == null )

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java Tue Nov  2 17:22:19 2010
@@ -103,7 +103,7 @@ public abstract class DelegateEntry impl
         delegate = browserConnection.getEntryFromCache( dn );
 
         if ( delegate != null
-            && !delegate.getBrowserConnection().getConnection().getJNDIConnectionWrapper().isConnected() )
+            && !delegate.getBrowserConnection().getConnection().getConnectionWrapper().isConnected() )
         {
             entryDoesNotExist = false;
             delegate = null;

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchContinuation.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchContinuation.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchContinuation.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/SearchContinuation.java Tue Nov  2 17:22:19 2010
@@ -151,8 +151,8 @@ public class SearchContinuation extends 
     public void resolve()
     {
         // get referral connection, exit if canceled
-        List<LdapURL> urls = new ArrayList<LdapURL>();
-        urls.add( searchContinuationURL );
+        List<String> urls = new ArrayList<String>();
+        urls.add( searchContinuationURL.toString() );
         Connection referralConnection = ConnectionCorePlugin.getDefault().getReferralHandler().getReferralConnection(
             urls );
         if ( referralConnection == null )

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/resources/icons/entry_alias.png
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/resources/icons/entry_alias.png?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
Binary files - no diff available.

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/resources/icons/entry_ref.png
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/resources/icons/entry_ref.png?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
Binary files - no diff available.

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java Tue Nov  2 17:22:19 2010
@@ -311,7 +311,7 @@ public class ImportExportAction extends 
     protected IBrowserConnection getConnection()
     {
         if ( getSelectedConnections().length > 0
-            && getSelectedConnections()[0].getJNDIConnectionWrapper().isConnected() )
+            && getSelectedConnections()[0].getConnectionWrapper().isConnected() )
         {
             Connection connection = getSelectedConnections()[0];
             IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager()

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/RootDSEPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/RootDSEPropertyPage.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/RootDSEPropertyPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/RootDSEPropertyPage.java Tue Nov  2 17:22:19 2010
@@ -120,7 +120,7 @@ public class RootDSEPropertyPage extends
         Composite infoComposite = new Composite( tabFolder, SWT.NONE );
         GridLayout gl = new GridLayout( 2, false );
         infoComposite.setLayout( gl );
-        BaseWidgetUtils.createLabel( infoComposite, Messages.getString( "RootDSEPropertyPage.DirectoryTypw" ), 1 ); //$NON-NLS-1$
+        BaseWidgetUtils.createLabel( infoComposite, Messages.getString( "RootDSEPropertyPage.DirectoryType" ), 1 ); //$NON-NLS-1$
         Text typeText = BaseWidgetUtils.createWrappedLabeledText( infoComposite, "-", 1, 150 ); //$NON-NLS-1$
         if ( connection != null && connection.getRootDSE() != null )
         {

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages.properties?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages.properties (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages.properties Tue Nov  2 17:22:19 2010
@@ -63,7 +63,7 @@ EntryPropertyPage.URL=URL:
 RootDSEPropertyPage.ApacheDirectoryServer=Apache Directory Server
 RootDSEPropertyPage.Controls=Controls
 RootDSEPropertyPage.Dash=-
-RootDSEPropertyPage.DirectoryTypw=Directory Type:
+RootDSEPropertyPage.DirectoryType=Directory Type:
 RootDSEPropertyPage.Extensions=Extensions
 RootDSEPropertyPage.Features=Features
 RootDSEPropertyPage.IBMTivoli=IBM Tivoli Directory Server

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages_de.properties?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages_de.properties (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages_de.properties Tue Nov  2 17:22:19 2010
@@ -57,7 +57,7 @@ EntryPropertyPage.NumberOfValues=Anzahl 
 EntryPropertyPage.Refresh=Erneuern
 EntryPropertyPage.SizingInformation=Gr\u00F6ssen-Information
 RootDSEPropertyPage.Controls=Steuerungs-Elemente
-RootDSEPropertyPage.DirectoryTypw=Verzeichnis-Typ\:
+RootDSEPropertyPage.DirectoryType=Verzeichnis-Typ\:
 RootDSEPropertyPage.Extensions=Erweiterungen
 RootDSEPropertyPage.Features=Merkmale
 RootDSEPropertyPage.Info=Information

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages_fr.properties?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages_fr.properties (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/messages_fr.properties Tue Nov  2 17:22:19 2010
@@ -63,7 +63,7 @@ EntryPropertyPage.URL=URL:
 RootDSEPropertyPage.ApacheDirectoryServer=Apache Directory Server
 RootDSEPropertyPage.Controls=Controls
 RootDSEPropertyPage.Dash=-
-RootDSEPropertyPage.DirectoryTypw=Type d'annuaire:
+RootDSEPropertyPage.DirectoryType=Type d'annuaire:
 RootDSEPropertyPage.Extensions=Extensions
 RootDSEPropertyPage.Features=Features
 RootDSEPropertyPage.IBMTivoli=IBM Tivoli Directory Server

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewUniversalListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewUniversalListener.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewUniversalListener.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewUniversalListener.java Tue Nov  2 17:22:19 2010
@@ -159,9 +159,9 @@ public class ConnectionViewUniversalList
      */
     private void toggleConnection( Connection connection )
     {
-        if ( connection.getJNDIConnectionWrapper().isConnected() )
+        if ( connection.getConnectionWrapper().isConnected() )
         {
-            connection.getJNDIConnectionWrapper().disconnect();
+            connection.getConnectionWrapper().disconnect();
         }
         else
         {

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java Tue Nov  2 17:22:19 2010
@@ -110,7 +110,7 @@ public class BatchOperationWizard extend
         // if(searches.length + entries.length + searchResults.length +
         // bookmarks.length > 0) {
         if ( connections.length > 0
-            && connections[0].getJNDIConnectionWrapper().isConnected()
+            && connections[0].getConnectionWrapper().isConnected()
             || searches.length + entries.length + searchResults.length + bookmarks.length + attributes.length
                 + values.length > 0 )
         {

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizard.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizard.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizard.java Tue Nov  2 17:22:19 2010
@@ -113,7 +113,7 @@ public class ExportConnectionsWizard ext
             // Creating the ZipOutputStream
             ZipOutputStream zos = new ZipOutputStream( new FileOutputStream( new File( exportFileName ) ) );
             // Writing the Connections file.
-            zos.putNextEntry( new ZipEntry( Messages.getString( "ExportConnectionsWizard.1" ) ) ); //$NON-NLS-1$
+            zos.putNextEntry( new ZipEntry( "connections.xml" ) ); //$NON-NLS-1$
             Connection[] connections = ConnectionCorePlugin.getDefault().getConnectionManager().getConnections();
             Set<ConnectionParameter> connectionParameters = new HashSet<ConnectionParameter>();
             for ( Connection connection : connections )
@@ -123,7 +123,7 @@ public class ExportConnectionsWizard ext
             ConnectionIO.save( connectionParameters, zos );
             zos.closeEntry();
             // Writing the Connection Folders file.
-            zos.putNextEntry( new ZipEntry( Messages.getString( "ExportConnectionsWizard.2" ) ) ); //$NON-NLS-1$
+            zos.putNextEntry( new ZipEntry( "connectionFolders.xml" ) ); //$NON-NLS-1$
             ConnectionFolder[] connectionFolders = ConnectionCorePlugin.getDefault().getConnectionFolderManager()
                 .getConnectionFolders();
             Set<ConnectionFolder> connectionFoldersSet = new HashSet<ConnectionFolder>();
@@ -134,7 +134,7 @@ public class ExportConnectionsWizard ext
             ConnectionIO.saveConnectionFolders( connectionFoldersSet, zos );
             zos.closeEntry();
             // Writing the Browser Connections file.
-            zos.putNextEntry( new ZipEntry( Messages.getString( "ExportConnectionsWizard.3" ) ) ); //$NON-NLS-1$
+            zos.putNextEntry( new ZipEntry( "browserconnections.xml" ) ); //$NON-NLS-1$
             IBrowserConnection[] browserConnections = BrowserCorePlugin.getDefault().getConnectionManager()
                 .getBrowserConnections();
             Map<String, IBrowserConnection> browserConnectionsMap = new HashMap<String, IBrowserConnection>();

Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties Tue Nov  2 17:22:19 2010
@@ -49,9 +49,6 @@ ExportBaseToPage.FileType={0} File
 ExportBaseToPage.OverwriteExistingFile=O&verwrite existing {0} file
 ExportBaseToPage.PleaseEnterTargetFile=Please enter the target {0} file.
 ExportBaseToPage.SelectFileType=Select {0} File
-ExportConnectionsWizard.1=connections.xml
-ExportConnectionsWizard.2=connectionFolders.xml
-ExportConnectionsWizard.3=browserconnections.xml
 ExportConnectionsWizard.ConnectionsExport=Connections Export
 ExportConnectionsWizardPage.ChooseFile=Choose a file
 ExportConnectionsWizardPage.DefineConnectionsExport=Define where connections should be exported.

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java Tue Nov  2 17:22:19 2010
@@ -35,7 +35,7 @@ import org.apache.directory.studio.commo
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
 import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
-import org.apache.directory.studio.connection.core.io.jndi.JNDIConnectionWrapper;
+import org.apache.directory.studio.connection.core.io.ConnectionWrapper;
 import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
 import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
 import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
@@ -94,7 +94,7 @@ public class ApacheDsSchemaConnector ext
     {
         List<Schema> schemas = new ArrayList<Schema>();
 
-        JNDIConnectionWrapper wrapper = connection.getJNDIConnectionWrapper();
+        ConnectionWrapper wrapper = connection.getConnectionWrapper();
 
         monitor.beginTask( Messages.getString( "GenericSchemaConnector.FetchingSchema" ), 1 ); //$NON-NLS-1$
 
@@ -146,7 +146,7 @@ public class ApacheDsSchemaConnector ext
      */
     public boolean isSuitableConnector( Connection connection, StudioProgressMonitor monitor )
     {
-        JNDIConnectionWrapper wrapper = connection.getJNDIConnectionWrapper();
+        ConnectionWrapper wrapper = connection.getConnectionWrapper();
 
         SearchControls constraintSearch = new SearchControls();
         constraintSearch.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -198,7 +198,7 @@ public class ApacheDsSchemaConnector ext
     }
 
 
-    private static Schema getSchema( JNDIConnectionWrapper wrapper, String name, StudioProgressMonitor monitor )
+    private static Schema getSchema( ConnectionWrapper wrapper, String name, StudioProgressMonitor monitor )
         throws NamingException
     {
         monitor.subTask( name ); //$NON-NLS-1$

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java?rev=1030132&r1=1030131&r2=1030132&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java Tue Nov  2 17:22:19 2010
@@ -43,7 +43,7 @@ import org.apache.directory.studio.conne
 import org.apache.directory.studio.connection.core.Connection.AliasDereferencingMethod;
 import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
 import org.apache.directory.studio.connection.core.Utils;
-import org.apache.directory.studio.connection.core.io.jndi.JNDIConnectionWrapper;
+import org.apache.directory.studio.connection.core.io.ConnectionWrapper;
 import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
 import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
 import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
@@ -80,7 +80,7 @@ public class GenericSchemaConnector exte
     {
         List<Schema> schemas = new ArrayList<Schema>();
 
-        JNDIConnectionWrapper wrapper = connection.getJNDIConnectionWrapper();
+        ConnectionWrapper wrapper = connection.getConnectionWrapper();
 
         monitor.beginTask( Messages.getString( "GenericSchemaConnector.FetchingSchema" ), 1 ); //$NON-NLS-1$
 
@@ -131,7 +131,7 @@ public class GenericSchemaConnector exte
 
     private static String getSubschemaSubentry( Connection connection, StudioProgressMonitor monitor )
     {
-        JNDIConnectionWrapper wrapper = connection.getJNDIConnectionWrapper();
+        ConnectionWrapper wrapper = connection.getConnectionWrapper();
 
         SearchControls constraintSearch = new SearchControls();
         constraintSearch.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -183,7 +183,7 @@ public class GenericSchemaConnector exte
     }
 
 
-    private static Schema getSchema( JNDIConnectionWrapper wrapper, SearchResult searchResult,
+    private static Schema getSchema( ConnectionWrapper wrapper, SearchResult searchResult,
         StudioProgressMonitor monitor ) throws NamingException, ParseException
     {
         // Creating the schema



Mime
View raw message