directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r741773 - in /directory/studio/trunk/connection-core: ./ src/main/java/org/apache/directory/studio/connection/core/ src/main/java/org/apache/directory/studio/connection/core/io/ src/main/java/org/apache/directory/studio/connection/core/io/j...
Date Fri, 06 Feb 2009 23:03:07 GMT
Author: seelmann
Date: Fri Feb  6 23:03:06 2009
New Revision: 741773

URL: http://svn.apache.org/viewvc?rev=741773&view=rev
Log:
String externalization, German translations, constants

Modified:
    directory/studio/trunk/connection-core/plugin.properties
    directory/studio/trunk/connection-core/plugin.xml
    directory/studio/trunk/connection-core/plugin_de.properties
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionFolderManager.java
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/Messages.java
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/Utils.java
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDISubentriesControl.java
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifSearchLogger.java
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ReferralsInfo.java
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/messages.properties
    directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/messages_de.properties

Modified: directory/studio/trunk/connection-core/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/plugin.properties?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/plugin.properties (original)
+++ directory/studio/trunk/connection-core/plugin.properties Fri Feb  6 23:03:06 2009
@@ -23,8 +23,8 @@
 ExtensionPoint_ConnectionListener_id=org.apache.directory.studio.connectionlistener
 ExtensionPoint_ConnectionListener_name=Connection Listener
 
-ExtensionPoint_ConnectionInitialiazer_id=org.apache.directory.studio.connectionInitializer
-ExtensionPoint_ConnectionInitialiazer_name=Connection Initializer
+ExtensionPoint_ConnectionInitializer_id=org.apache.directory.studio.connectionInitializer
+ExtensionPoint_ConnectionInitializer_name=Connection Initializer
 
 JndiLogger_LdifModificationLogger_id=org.apache.directory.studio.connection.core.io.jndi.LdifModificationLogger
 JndiLogger_LdifModificationLogger_name=LDIF Modification Logger

Modified: directory/studio/trunk/connection-core/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/plugin.xml?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/plugin.xml (original)
+++ directory/studio/trunk/connection-core/plugin.xml Fri Feb  6 23:03:06 2009
@@ -21,7 +21,7 @@
 <plugin>
    <extension-point id="org.apache.directory.studio.jndilogger" name="%ExtensionPoint_JndiLogger_name" schema="src/main/resources/jndiLogger.exsd"/>
    <extension-point id="org.apache.directory.studio.connectionlistener" name="%ExtensionPoint_ConnectionListener_name" schema="src/main/resources/connectionListener.exsd"/>
-   <extension-point id="org.apache.directory.studio.connectionInitializer" name="%ExtensionPoint_ConnectionInitialiazer_name" schema="src/main/resources/connectionInitializer.exsd"/>
+   <extension-point id="org.apache.directory.studio.connectionInitializer" name="%ExtensionPoint_ConnectionInitializer_name" schema="src/main/resources/connectionInitializer.exsd"/>
    <extension
          point="org.apache.directory.studio.jndilogger">
       <jndiLogger

Modified: directory/studio/trunk/connection-core/plugin_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/plugin_de.properties?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/plugin_de.properties (original)
+++ directory/studio/trunk/connection-core/plugin_de.properties Fri Feb  6 23:03:06 2009
@@ -15,12 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-ExtensionPoint_ConnectionListener_name=Verbindungs-Empfänger
-
-ExtensionPoint_ConnectionInitialiazer_name=Verbindungs-Initialisierer
-
 JndiLogger_LdifModificationLogger_name=LDIF Änderungs-Logger
-JndiLogger_LdifModificationLogger_description=Logged Änderungen im LDIF Format in eine Datei.
+JndiLogger_LdifModificationLogger_description=Loggt Änderungen im LDIF Format in eine Datei.
 
 JndiLogger_LdifSearchLogger_name=LDIF Such-Logger
-JndiLogger_LdifSearchLogger_description=Logged Suchen im LDIF Format in eine Datei.
\ No newline at end of file
+JndiLogger_LdifSearchLogger_description=Loggt Suchen im LDIF Format in eine Datei.
\ No newline at end of file

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCoreConstants.java Fri Feb  6 23:03:06 2009
@@ -30,7 +30,7 @@
 {
     /** The plug-in ID */
     public static final String PLUGIN_ID = ConnectionCorePlugin.getDefault().getPluginProperties().getString(
-        "Plugin_id" );
+        "Plugin_id" ); //$NON-NLS-1$
 
     /** The line separator. */
     public static final String LINE_SEPARATOR = System.getProperty( "line.separator" ); //$NON-NLS-1$
@@ -39,30 +39,30 @@
     public static final String DATEFORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS"; //$NON-NLS-1$
 
     /** The constant used to preferred LDAP context factory */
-    public static final String PREFERENCE_LDAP_CONTEXT_FACTORY = "ldapContextFactory";
+    public static final String PREFERENCE_LDAP_CONTEXT_FACTORY = "ldapContextFactory"; //$NON-NLS-1$
 
     /** The constant used to identify the "enable modification logs" preference  */
-    public static final String PREFERENCE_MODIFICATIONLOGS_ENABLE = "modificationLogsEnable";
+    public static final String PREFERENCE_MODIFICATIONLOGS_ENABLE = "modificationLogsEnable"; //$NON-NLS-1$
 
     /** The constant used to identify the "modification log file count" preference  */
-    public static final String PREFERENCE_MODIFICATIONLOGS_FILE_COUNT = "modificationLogsFileCount";
+    public static final String PREFERENCE_MODIFICATIONLOGS_FILE_COUNT = "modificationLogsFileCount"; //$NON-NLS-1$
 
     /** The constant used to identify the "modification log file size" preference  */
-    public static final String PREFERENCE_MODIFICATIONLOGS_FILE_SIZE = "modificationLogsFileSize";
+    public static final String PREFERENCE_MODIFICATIONLOGS_FILE_SIZE = "modificationLogsFileSize"; //$NON-NLS-1$
 
     /** The constant used to identify the "enable search request logs" preference  */
-    public static final String PREFERENCE_SEARCHREQUESTLOGS_ENABLE = "searchRequestLogsEnable";
+    public static final String PREFERENCE_SEARCHREQUESTLOGS_ENABLE = "searchRequestLogsEnable"; //$NON-NLS-1$
 
     /** The constant used to identify the "enable search result entry logs" preference  */
-    public static final String PREFERENCE_SEARCHRESULTENTRYLOGS_ENABLE = "searchResultEntryLogsEnable";
+    public static final String PREFERENCE_SEARCHRESULTENTRYLOGS_ENABLE = "searchResultEntryLogsEnable"; //$NON-NLS-1$
 
     /** The constant used to identify the "search log file count" preference  */
-    public static final String PREFERENCE_SEARCHLOGS_FILE_COUNT = "searchLogsFileCount";
+    public static final String PREFERENCE_SEARCHLOGS_FILE_COUNT = "searchLogsFileCount"; //$NON-NLS-1$
 
     /** The constant used to identify the "search log file size" preference  */
-    public static final String PREFERENCE_SEARCHLOGS_FILE_SIZE = "searchLogsFileSize";
+    public static final String PREFERENCE_SEARCHLOGS_FILE_SIZE = "searchLogsFileSize"; //$NON-NLS-1$
 
     /** The constant used to identify the "masked attributes" preference  */
-    public static final String PREFERENCE_MODIFICATIONLOGS_MASKED_ATTRIBUTES = "modificationLogsMaskedAttributes";
+    public static final String PREFERENCE_MODIFICATIONLOGS_MASKED_ATTRIBUTES = "modificationLogsMaskedAttributes"; //$NON-NLS-1$
 
 }

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java Fri Feb  6 23:03:06 2009
@@ -281,23 +281,23 @@
 
             IExtensionRegistry registry = Platform.getExtensionRegistry();
             IExtensionPoint extensionPoint = registry.getExtensionPoint( getPluginProperties().getString(
-                "ExtensionPoint_JndiLogger_id" ) );
+                "ExtensionPoint_JndiLogger_id" ) ); //$NON-NLS-1$
             IConfigurationElement[] members = extensionPoint.getConfigurationElements();
             for ( IConfigurationElement member : members )
             {
                 try
                 {
-                    IJndiLogger logger = ( IJndiLogger ) member.createExecutableExtension( "class" );
-                    logger.setId( member.getAttribute( "id" ) );
-                    logger.setName( member.getAttribute( "name" ) );
-                    logger.setDescription( member.getAttribute( "description" ) );
+                    IJndiLogger logger = ( IJndiLogger ) member.createExecutableExtension( "class" ); //$NON-NLS-1$
+                    logger.setId( member.getAttribute( "id" ) ); //$NON-NLS-1$
+                    logger.setName( member.getAttribute( "name" ) ); //$NON-NLS-1$
+                    logger.setDescription( member.getAttribute( "description" ) ); //$NON-NLS-1$
                     jndiLoggers.add( logger );
                 }
                 catch ( Exception e )
                 {
                     getLog().log(
                         new Status( IStatus.ERROR, ConnectionCoreConstants.PLUGIN_ID, 1,
-                            "Unable to create JNDI logger " + member.getAttribute( "class" ), e ) );
+                            Messages.error__unable_to_create_jndi_logger + member.getAttribute( "class" ), e ) ); //$NON-NLS-1$
                 }
             }
         }
@@ -319,23 +319,20 @@
 
             IExtensionRegistry registry = Platform.getExtensionRegistry();
             IExtensionPoint extensionPoint = registry.getExtensionPoint( getPluginProperties().getString(
-                "ExtensionPoint_ConnectionListener_id" ) );
+                "ExtensionPoint_ConnectionListener_id" ) ); //$NON-NLS-1$
             IConfigurationElement[] members = extensionPoint.getConfigurationElements();
             for ( IConfigurationElement member : members )
             {
                 try
                 {
-                    IConnectionListener listener = ( IConnectionListener ) member.createExecutableExtension( "class" );
-                    //                    listener.setId( member.getAttribute( "id" ) );
-                    //                    listener.setName( member.getAttribute( "name" ) );
-                    //                    listener.setDescription( member.getAttribute( "description" ) );
+                    IConnectionListener listener = ( IConnectionListener ) member.createExecutableExtension( "class" ); //$NON-NLS-1$
                     connectionListeners.add( listener );
                 }
                 catch ( Exception e )
                 {
                     getLog().log(
                         new Status( IStatus.ERROR, ConnectionCoreConstants.PLUGIN_ID, 1,
-                            "Unable to create connection listener " + member.getAttribute( "class" ), e ) );
+                            Messages.error__unable_to_create_connection_listener + member.getAttribute( "class" ), e ) ); //$NON-NLS-1$
                 }
             }
         }
@@ -357,15 +354,15 @@
             try
             {
                 properties = new PropertyResourceBundle( FileLocator.openStream( this.getBundle(), new Path(
-                    "plugin.properties" ), false ) );
+                    "plugin.properties" ), false ) ); //$NON-NLS-1$
             }
             catch ( IOException e )
             {
                 // We can't use the PLUGIN_ID constant since loading the plugin.properties file has failed,
                 // So we're using a default plugin id.
                 getLog().log(
-                    new Status( Status.ERROR, "org.apache.directory.studio.connection.core", Status.OK,
-                        "Unable to get the plugin properties.", e ) );
+                    new Status( Status.ERROR, "org.apache.directory.studio.connection.core", Status.OK, //$NON-NLS-1$
+                        Messages.error__unable_to_get_plugin_properties, e ) );
             }
         }
 
@@ -386,11 +383,11 @@
      */
     public String getDefaultLdapContextFactory()
     {
-        String defaultLdapContextFactory = "";
+        String defaultLdapContextFactory = ""; //$NON-NLS-1$
 
         try
         {
-            String sun = "com.sun.jndi.ldap.LdapCtxFactory";
+            String sun = "com.sun.jndi.ldap.LdapCtxFactory"; //$NON-NLS-1$
             Class.forName( sun );
             defaultLdapContextFactory = sun;
         }
@@ -399,7 +396,7 @@
         }
         try
         {
-            String apache = "org.apache.harmony.jndi.provider.ldap.LdapContextFactory";
+            String apache = "org.apache.harmony.jndi.provider.ldap.LdapContextFactory"; //$NON-NLS-1$
             Class.forName( apache );
             defaultLdapContextFactory = apache;
         }

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionFolderManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionFolderManager.java?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionFolderManager.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionFolderManager.java Fri Feb  6 23:03:06 2009
@@ -46,6 +46,9 @@
  */
 public class ConnectionFolderManager implements ConnectionUpdateListener
 {
+    private static final String CONNECTION_FOLDERS_FILENAME = "connectionFolders.xml"; //$NON-NLS-1$
+
+    private static final String ROOT_ID = "0"; //$NON-NLS-1$
 
     /** The root connection folder. */
     private ConnectionFolder root;
@@ -59,8 +62,8 @@
      */
     public ConnectionFolderManager()
     {
-        this.root = new ConnectionFolder( "" );
-        this.root.setId( "0" ); //$NON-NLS-1$s
+        this.root = new ConnectionFolder( "" ); //$NON-NLS-1$s
+        this.root.setId( ROOT_ID ); //$NON-NLS-1$s
         this.folderList = new HashSet<ConnectionFolder>();
 
         loadConnectionFolders();
@@ -78,8 +81,8 @@
      */
     public static final String getConnectionFolderStoreFileName()
     {
-        String filename = ConnectionCorePlugin.getDefault().getStateLocation()
-            .append( "connectionFolders.xml" ).toOSString(); //$NON-NLS-1$
+        String filename = ConnectionCorePlugin.getDefault().getStateLocation().append( CONNECTION_FOLDERS_FILENAME )
+            .toOSString();
         return filename;
     }
 
@@ -349,7 +352,7 @@
         try
         {
             ConnectionIO.saveConnectionFolders( folderList, new FileOutputStream( getConnectionFolderStoreFileName()
-                + "-temp" ) );
+                + ConnectionManager.TEMP_SUFFIX ) );
         }
         catch ( IOException e )
         {
@@ -359,7 +362,7 @@
 
         // move temp file to good file
         File file = new File( getConnectionFolderStoreFileName() );
-        File tempFile = new File( getConnectionFolderStoreFileName() + "-temp" );
+        File tempFile = new File( getConnectionFolderStoreFileName() + ConnectionManager.TEMP_SUFFIX );
         if ( file.exists() )
         {
             file.delete();
@@ -367,8 +370,8 @@
 
         try
         {
-            String content = FileUtils.readFileToString( tempFile, "UTF-8" );
-            FileUtils.writeStringToFile( file, content, "UTF-8" );
+            String content = FileUtils.readFileToString( tempFile, ConnectionManager.ENCODING_UTF8 );
+            FileUtils.writeStringToFile( file, content, ConnectionManager.ENCODING_UTF8 );
         }
         catch ( IOException e )
         {
@@ -393,7 +396,7 @@
             try
             {
                 folderList = ConnectionIO.loadConnectionFolders( new FileInputStream(
-                    getConnectionFolderStoreFileName() + "-temp" ) );
+                    getConnectionFolderStoreFileName() + ConnectionManager.TEMP_SUFFIX ) );
             }
             catch ( FileNotFoundException e1 )
             {
@@ -409,7 +412,7 @@
         {
             for ( ConnectionFolder folder : folderList )
             {
-                if ( "0".equals( folder.getId() ) )
+                if ( ROOT_ID.equals( folder.getId() ) )
                 {
                     root = folder;
                 }

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/ConnectionManager.java Fri Feb  6 23:03:06 2009
@@ -51,6 +51,20 @@
  */
 public class ConnectionManager implements ConnectionUpdateListener
 {
+    private static final String LOGS_PATH = "logs"; //$NON-NLS-1$
+
+    private static final String SEARCH_LOGS_PREFIX = "search-"; //$NON-NLS-1$
+
+    private static final String MODIFICATIONS_LOG_PREFIX = "modifications-"; //$NON-NLS-1$
+
+    private static final String LDIFLOG_SUFFIX = "-%u-%g.ldiflog"; //$NON-NLS-1$
+
+    private static final String CONNECTIONS_XML = "connections.xml"; //$NON-NLS-1$
+
+    public static final String ENCODING_UTF8 = "UTF-8"; //$NON-NLS-1$
+
+    public static final String TEMP_SUFFIX = "-temp"; //$NON-NLS-1$
+
 
     /** The list of connections. */
     private Set<Connection> connectionList;
@@ -82,12 +96,12 @@
 
         IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
             ConnectionCorePlugin.getDefault().getPluginProperties().getString(
-                "ExtensionPoint_ConnectionInitialiazer_id" ) );
+                "ExtensionPoint_ConnectionInitializer_id" ) ); //$NON-NLS-1$
 
         IConfigurationElement[] configurationElements = extensionPoint.getConfigurationElements();
         for ( IConfigurationElement configurationElement : configurationElements )
         {
-            if ( "connection".equals( configurationElement.getName() ) )
+            if ( "connection".equals( configurationElement.getName() ) ) //$NON-NLS-1$
             {
                 addInitialConnection( configurationElement );
             }
@@ -105,14 +119,14 @@
         try
         {
             ConnectionParameter connectionParameter = ( ConnectionParameter ) configurationElement
-                .createExecutableExtension( "class" );
+                .createExecutableExtension( "class" ); //$NON-NLS-1$
             Connection conn = new Connection( connectionParameter );
             connectionList.add( conn );
         }
         catch ( CoreException e )
         {
             Status status = new Status( IStatus.ERROR, ConnectionCoreConstants.PLUGIN_ID,
-                "Exception occured while executing connection initializer: " + e.getMessage(), e );
+                Messages.error__execute_connection_initializer + e.getMessage(), e );
             ConnectionCorePlugin.getDefault().getLog().log( status );
         }
     }
@@ -128,14 +142,14 @@
      */
     public static final String getModificationLogFileName( Connection connection )
     {
-        IPath p = ConnectionCorePlugin.getDefault().getStateLocation().append( "logs" ); //$NON-NLS-1$
+        IPath p = ConnectionCorePlugin.getDefault().getStateLocation().append( LOGS_PATH );
         File file = p.toFile();
         if ( !file.exists() )
         {
             file.mkdir();
         }
         return p
-            .append( "modifications-" + Utils.getFilenameString( connection.getId() ) + "-%u-%g.ldiflog" ).toOSString(); //$NON-NLS-1$ //$NON-NLS-2$
+            .append( MODIFICATIONS_LOG_PREFIX + Utils.getFilenameString( connection.getId() ) + LDIFLOG_SUFFIX ).toOSString();
     }
 
 
@@ -149,13 +163,13 @@
      */
     public static final String getSearchLogFileName( Connection connection )
     {
-        IPath p = ConnectionCorePlugin.getDefault().getStateLocation().append( "logs" ); //$NON-NLS-1$
+        IPath p = ConnectionCorePlugin.getDefault().getStateLocation().append( LOGS_PATH ); //$NON-NLS-1$
         File file = p.toFile();
         if ( !file.exists() )
         {
             file.mkdir();
         }
-        return p.append( "search-" + Utils.getFilenameString( connection.getId() ) + "-%u-%g.ldiflog" ).toOSString(); //$NON-NLS-1$ //$NON-NLS-2$
+        return p.append( SEARCH_LOGS_PREFIX + Utils.getFilenameString( connection.getId() ) + LDIFLOG_SUFFIX ).toOSString();
     }
 
 
@@ -167,7 +181,7 @@
      */
     public static final String getConnectionStoreFileName()
     {
-        String filename = ConnectionCorePlugin.getDefault().getStateLocation().append( "connections.xml" ).toOSString(); //$NON-NLS-1$
+        String filename = ConnectionCorePlugin.getDefault().getStateLocation().append( CONNECTIONS_XML ).toOSString();
         return filename;
     }
 
@@ -341,17 +355,18 @@
         // To avoid a corrupt file, save object to a temp file first 
         try
         {
-            ConnectionIO.save( connectionParameters, new FileOutputStream( getConnectionStoreFileName() + "-temp" ) );
+            ConnectionIO.save( connectionParameters, new FileOutputStream( getConnectionStoreFileName() + TEMP_SUFFIX ) );
         }
         catch ( IOException e )
         {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            Status status = new Status( IStatus.ERROR, ConnectionCoreConstants.PLUGIN_ID,
+                Messages.error__saving_connections + e.getMessage(), e );
+            ConnectionCorePlugin.getDefault().getLog().log( status );
         }
 
         // move temp file to good file
         File file = new File( getConnectionStoreFileName() );
-        File tempFile = new File( getConnectionStoreFileName() + "-temp" );
+        File tempFile = new File( getConnectionStoreFileName() + TEMP_SUFFIX );
         if ( file.exists() )
         {
             file.delete();
@@ -359,13 +374,14 @@
 
         try
         {
-            String content = FileUtils.readFileToString( tempFile, "UTF-8" );
-            FileUtils.writeStringToFile( file, content, "UTF-8" );
+            String content = FileUtils.readFileToString( tempFile, ENCODING_UTF8 );
+            FileUtils.writeStringToFile( file, content, ENCODING_UTF8 );
         }
         catch ( IOException e )
         {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            Status status = new Status( IStatus.ERROR, ConnectionCoreConstants.PLUGIN_ID,
+                Messages.error__saving_connections + e.getMessage(), e );
+            ConnectionCorePlugin.getDefault().getLog().log( status );
         }
     }
 
@@ -387,17 +403,18 @@
             try
             {
                 connectionParameters = ConnectionIO
-                    .load( new FileInputStream( getConnectionStoreFileName() + "-temp" ) );
+                    .load( new FileInputStream( getConnectionStoreFileName() + TEMP_SUFFIX ) );
             }
             catch ( FileNotFoundException e1 )
             {
-                // TODO Auto-generated catch block
+                // ignore, this is a fresh workspace
                 return;
             }
             catch ( ConnectionIOException e1 )
             {
-                // TODO Auto-generated catch block
-                return;
+                Status status = new Status( IStatus.ERROR, ConnectionCoreConstants.PLUGIN_ID,
+                    Messages.error__loading_connections + e.getMessage(), e );
+                ConnectionCorePlugin.getDefault().getLog().log( status );
             }
         }
 

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/DnUtils.java Fri Feb  6 23:03:06 2009
@@ -170,7 +170,7 @@
         {
         }
 
-        throw new InvalidNameException( "RDN is invalid" );
+        throw new InvalidNameException( Messages.error__invalid_rdn );
     }
 
 }

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/Messages.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/Messages.java?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/Messages.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/Messages.java Fri Feb  6 23:03:06 2009
@@ -50,12 +50,20 @@
 
     public static String copy_n_of_s;
 
+    public static String error__execute_connection_initializer;
+    public static String error__invalid_rdn;
+    public static String error__saving_connections;
+    public static String error__loading_connections;
+    public static String error__unable_to_create_connection_listener;
+    public static String error__unable_to_create_jndi_logger;
+    public static String error__unable_to_get_plugin_properties;
+    public static String error__loop_detected;
+    public static String error__connection_is_readonly;
+
     public static String model__no_auth_handler;
     public static String model__no_credentials;
 
-    public static String jobs__error_occurred;
     public static String jobs__progressmonitor_check_cancellation;
-    public static String jobs__progressmonitor_report_progress;
 
     public static String jobs__check_bind_name;
     public static String jobs__check_bind_task;

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/Utils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/Utils.java?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/Utils.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/Utils.java Fri Feb  6 23:03:06 2009
@@ -42,6 +42,9 @@
 public class Utils
 {
 
+    private static final String DOT_DOT_DOT = "..."; //$NON-NLS-1$
+
+
     /**
      * Shortens the given label to the given maximum length
      * and filters non-printable characters.
@@ -61,11 +64,11 @@
         // shorten label
         if ( maxLength < 3 )
         {
-            return "...";
+            return DOT_DOT_DOT;
         }
         if ( label.length() > maxLength )
         {
-            label = label.substring( 0, maxLength / 2 ) + "..."
+            label = label.substring( 0, maxLength / 2 ) + DOT_DOT_DOT
                 + label.substring( label.length() - maxLength / 2, label.length() );
 
         }
@@ -121,7 +124,7 @@
                     x = 256 + x;
                 String t = Integer.toHexString( x );
                 if ( t.length() == 1 )
-                    t = "0" + t; //$NON-NLS-1$
+                    t = '0' + t; //$NON-NLS-1$
                 sb.append( t );
             }
         }
@@ -145,7 +148,8 @@
         String[] attributes )
     {
         LdapURL url = new LdapURL();
-        url.setScheme( connection.getEncryptionMethod() == EncryptionMethod.LDAPS ? "ldaps://" : "ldap://" );
+        url.setScheme( connection.getEncryptionMethod() == EncryptionMethod.LDAPS ? LdapURL.LDAPS_SCHEME
+            : LdapURL.LDAP_SCHEME );
         url.setHost( connection.getHost() );
         url.setPort( connection.getPort() );
         try
@@ -185,71 +189,71 @@
     {
         StringBuilder cmdLine = new StringBuilder();
 
-        cmdLine.append( "ldapsearch" );
+        cmdLine.append( "ldapsearch" ); //$NON-NLS-1$
 
-        cmdLine.append( " -H " ).append(
-            connection.getEncryptionMethod() == EncryptionMethod.LDAPS ? "ldaps://" : "ldap://" ).append(
-            connection.getHost() ).append( ":" ).append( connection.getPort() );
+        cmdLine.append( " -H " ).append( //$NON-NLS-1$
+            connection.getEncryptionMethod() == EncryptionMethod.LDAPS ? LdapURL.LDAPS_SCHEME : LdapURL.LDAP_SCHEME )
+            .append( connection.getHost() ).append( ":" ).append( connection.getPort() ); //$NON-NLS-1$
 
         if ( connection.getEncryptionMethod() == EncryptionMethod.START_TLS )
         {
-            cmdLine.append( " -ZZ" );
+            cmdLine.append( " -ZZ" ); //$NON-NLS-1$
         }
 
         switch ( connection.getAuthMethod() )
         {
             case SIMPLE:
-                cmdLine.append( " -x" );
-                cmdLine.append( " -D \"" ).append( connection.getBindPrincipal() ).append( "\"" );
-                cmdLine.append( " -W" );
+                cmdLine.append( " -x" ); //$NON-NLS-1$
+                cmdLine.append( " -D \"" ).append( connection.getBindPrincipal() ).append( "\"" ); //$NON-NLS-1$ //$NON-NLS-2$
+                cmdLine.append( " -W" ); //$NON-NLS-1$
                 break;
             case SASL_CRAM_MD5:
-                cmdLine.append( " -U \"" ).append( connection.getBindPrincipal() ).append( "\"" );
-                cmdLine.append( " -Y \"CRAM-MD5\"" );
+                cmdLine.append( " -U \"" ).append( connection.getBindPrincipal() ).append( "\"" ); //$NON-NLS-1$ //$NON-NLS-2$
+                cmdLine.append( " -Y \"CRAM-MD5\"" ); //$NON-NLS-1$
                 break;
             case SASL_DIGEST_MD5:
-                cmdLine.append( " -U \"" ).append( connection.getBindPrincipal() ).append( "\"" );
-                cmdLine.append( " -Y \"DIGEST-MD5\"" );
+                cmdLine.append( " -U \"" ).append( connection.getBindPrincipal() ).append( "\"" ); //$NON-NLS-1$ //$NON-NLS-2$
+                cmdLine.append( " -Y \"DIGEST-MD5\"" ); //$NON-NLS-1$
                 break;
             case SASL_GSSAPI:
-                cmdLine.append( " -Y \"GSSAPI\"" );
+                cmdLine.append( " -Y \"GSSAPI\"" ); //$NON-NLS-1$
                 break;
         }
 
-        cmdLine.append( " -b \"" ).append( searchBase ).append( "\"" );
+        cmdLine.append( " -b \"" ).append( searchBase ).append( "\"" ); //$NON-NLS-1$ //$NON-NLS-2$
 
-        String scopeAsString = scope == SearchControls.SUBTREE_SCOPE ? "sub"
-            : scope == SearchControls.ONELEVEL_SCOPE ? "one" : "base";
-        cmdLine.append( " -s " ).append( scopeAsString );
+        String scopeAsString = scope == SearchControls.SUBTREE_SCOPE ? "sub" //$NON-NLS-1$
+            : scope == SearchControls.ONELEVEL_SCOPE ? "one" : "base"; //$NON-NLS-1$ //$NON-NLS-2$
+        cmdLine.append( " -s " ).append( scopeAsString ); //$NON-NLS-1$
 
         if ( aliasesDereferencingMethod != AliasDereferencingMethod.NEVER )
         {
-            String aliasAsString = aliasesDereferencingMethod == AliasDereferencingMethod.ALWAYS ? "always"
-                : aliasesDereferencingMethod == AliasDereferencingMethod.FINDING ? "find"
-                    : aliasesDereferencingMethod == AliasDereferencingMethod.SEARCH ? "search" : "never";
-            cmdLine.append( " -a " ).append( aliasAsString );
+            String aliasAsString = aliasesDereferencingMethod == AliasDereferencingMethod.ALWAYS ? "always" //$NON-NLS-1$
+                : aliasesDereferencingMethod == AliasDereferencingMethod.FINDING ? "find" //$NON-NLS-1$
+                    : aliasesDereferencingMethod == AliasDereferencingMethod.SEARCH ? "search" : "never"; //$NON-NLS-1$ //$NON-NLS-2$
+            cmdLine.append( " -a " ).append( aliasAsString ); //$NON-NLS-1$
         }
 
         if ( sizeLimit > 0 )
         {
-            cmdLine.append( " -z " ).append( sizeLimit );
+            cmdLine.append( " -z " ).append( sizeLimit ); //$NON-NLS-1$
         }
         if ( timeLimit > 0 )
         {
-            cmdLine.append( " -l " ).append( timeLimit );
+            cmdLine.append( " -l " ).append( timeLimit ); //$NON-NLS-1$
         }
 
-        cmdLine.append( " \"" ).append( filter ).append( "\"" );
+        cmdLine.append( " \"" ).append( filter ).append( "\"" ); //$NON-NLS-1$ //$NON-NLS-2$
 
         if ( attributes != null )
         {
             if ( attributes.length == 0 )
             {
-                cmdLine.append( " \"1.1\"" );
+                cmdLine.append( " \"1.1\"" ); //$NON-NLS-1$
             }
             for ( String attribute : attributes )
             {
-                cmdLine.append( " \"" ).append( attribute ).append( "\"" );
+                cmdLine.append( " \"" ).append( attribute ).append( "\"" ); //$NON-NLS-1$ //$NON-NLS-2$
             }
         }
 

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/ConnectionIO.java Fri Feb  6 23:03:06 2009
@@ -52,25 +52,25 @@
 public class ConnectionIO
 {
     // XML tags
-    private static final String CONNECTIONS_TAG = "connections";
-    private static final String CONNECTION_TAG = "connection";
-    private static final String ID_TAG = "id";
-    private static final String NAME_TAG = "name";
-    private static final String HOST_TAG = "host";
-    private static final String PORT_TAG = "port";
-    private static final String ENCRYPTION_METHOD_TAG = "encryptionMethod";
-    private static final String AUTH_METHOD_TAG = "authMethod";
-    private static final String BIND_PRINCIPAL_TAG = "bindPrincipal";
-    private static final String BIND_PASSWORD_TAG = "bindPassword";
-    private static final String EXTENDED_PROPERTIES_TAG = "extendedProperties";
-    private static final String EXTENDED_PROPERTY_TAG = "extendedProperty";
-    private static final String KEY_TAG = "key";
-    private static final String VALUE_TAG = "value";
-
-    private static final String CONNECTION_FOLDERS_TAG = "connectionFolders";
-    private static final String CONNECTION_FOLDER_TAG = "connectionFolder";
-    private static final String SUB_FOLDERS_TAG = "subFolders";
-    private static final String SUB_FOLDER_TAG = "subFolder";
+    private static final String CONNECTIONS_TAG = "connections"; //$NON-NLS-1$
+    private static final String CONNECTION_TAG = "connection"; //$NON-NLS-1$
+    private static final String ID_TAG = "id"; //$NON-NLS-1$
+    private static final String NAME_TAG = "name"; //$NON-NLS-1$
+    private static final String HOST_TAG = "host"; //$NON-NLS-1$
+    private static final String PORT_TAG = "port"; //$NON-NLS-1$
+    private static final String ENCRYPTION_METHOD_TAG = "encryptionMethod"; //$NON-NLS-1$
+    private static final String AUTH_METHOD_TAG = "authMethod"; //$NON-NLS-1$
+    private static final String BIND_PRINCIPAL_TAG = "bindPrincipal"; //$NON-NLS-1$
+    private static final String BIND_PASSWORD_TAG = "bindPassword"; //$NON-NLS-1$
+    private static final String EXTENDED_PROPERTIES_TAG = "extendedProperties"; //$NON-NLS-1$
+    private static final String EXTENDED_PROPERTY_TAG = "extendedProperty"; //$NON-NLS-1$
+    private static final String KEY_TAG = "key"; //$NON-NLS-1$
+    private static final String VALUE_TAG = "value"; //$NON-NLS-1$
+
+    private static final String CONNECTION_FOLDERS_TAG = "connectionFolders"; //$NON-NLS-1$
+    private static final String CONNECTION_FOLDER_TAG = "connectionFolder"; //$NON-NLS-1$
+    private static final String SUB_FOLDERS_TAG = "subFolders"; //$NON-NLS-1$
+    private static final String SUB_FOLDER_TAG = "subFolder"; //$NON-NLS-1$
 
     /**
      * Loads the connections using the reader
@@ -101,7 +101,7 @@
         Element rootElement = document.getRootElement();
         if ( !rootElement.getName().equals( CONNECTIONS_TAG ) )
         {
-            throw new ConnectionIOException( "The file does not seem to be a valid Connections file." );
+            throw new ConnectionIOException( "The file does not seem to be a valid Connections file." ); //$NON-NLS-1$
         }
 
         for ( Iterator<?> i = rootElement.elementIterator( CONNECTION_TAG ); i.hasNext(); )
@@ -159,8 +159,8 @@
             }
             catch ( NumberFormatException e )
             {
-                throw new ConnectionIOException( "Unable to parse 'Port' of connection '" + connection.getName()
-                    + "' as int value. Port value :" + portAttribute.getValue() );
+                throw new ConnectionIOException( "Unable to parse 'Port' of connection '" + connection.getName() //$NON-NLS-1$
+                    + "' as int value. Port value :" + portAttribute.getValue() ); //$NON-NLS-1$
             }
         }
 
@@ -174,8 +174,8 @@
             }
             catch ( IllegalArgumentException e )
             {
-                throw new ConnectionIOException( "Unable to parse 'Encryption Method' of connection '"
-                    + connection.getName() + "' as int value. Encryption Method value :"
+                throw new ConnectionIOException( "Unable to parse 'Encryption Method' of connection '" //$NON-NLS-1$
+                    + connection.getName() + "' as int value. Encryption Method value :" //$NON-NLS-1$
                     + encryptionMethodAttribute.getValue() );
             }
         }
@@ -190,8 +190,8 @@
             }
             catch ( IllegalArgumentException e )
             {
-                throw new ConnectionIOException( "Unable to parse 'Authentication Method' of connection '"
-                    + connection.getName() + "' as int value. Authentication Method value :"
+                throw new ConnectionIOException( "Unable to parse 'Authentication Method' of connection '" //$NON-NLS-1$
+                    + connection.getName() + "' as int value. Authentication Method value :" //$NON-NLS-1$
                     + authMethodAttribute.getValue() );
             }
         }
@@ -260,7 +260,7 @@
 
         // Writing the file to disk
         OutputFormat outformat = OutputFormat.createPrettyPrint();
-        outformat.setEncoding( "UTF-8" );
+        outformat.setEncoding( "UTF-8" ); //$NON-NLS-1$
         XMLWriter writer = new XMLWriter( stream, outformat );
         writer.write( document );
         writer.flush();
@@ -289,7 +289,7 @@
         connectionElement.addAttribute( HOST_TAG, connection.getHost() );
 
         // Port
-        connectionElement.addAttribute( PORT_TAG, "" + connection.getPort() );
+        connectionElement.addAttribute( PORT_TAG, "" + connection.getPort() ); //$NON-NLS-1$
 
         // Encryption Method
         connectionElement.addAttribute( ENCRYPTION_METHOD_TAG, connection.getEncryptionMethod().toString() );
@@ -349,7 +349,7 @@
         Element rootElement = document.getRootElement();
         if ( !rootElement.getName().equals( CONNECTION_FOLDERS_TAG ) )
         {
-            throw new ConnectionIOException( "The file does not seem to be a valid ConnectionFolders file." );
+            throw new ConnectionIOException( "The file does not seem to be a valid ConnectionFolders file." ); //$NON-NLS-1$
         }
 
         for ( Iterator<?> i = rootElement.elementIterator( CONNECTION_FOLDER_TAG ); i.hasNext(); )
@@ -456,7 +456,7 @@
 
         // Writing the file to disk
         OutputFormat outformat = OutputFormat.createPrettyPrint();
-        outformat.setEncoding( "UTF-8" );
+        outformat.setEncoding( "UTF-8" ); //$NON-NLS-1$
         XMLWriter writer = new XMLWriter( stream, outformat );
         writer.write( document );
         writer.flush();

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java Fri Feb  6 23:03:06 2009
@@ -70,6 +70,7 @@
 import org.apache.directory.studio.connection.core.io.jndi.ReferralsInfo.UrlAndDn;
 import org.apache.directory.studio.connection.core.jobs.StudioProgressMonitor;
 import org.eclipse.core.runtime.Preferences;
+import org.eclipse.osgi.util.NLS;
 
 
 /**
@@ -88,6 +89,36 @@
 public class JNDIConnectionWrapper implements ConnectionWrapper
 {
 
+    private static final String JAVA_NAMING_LDAP_DELETE_RDN = "java.naming.ldap.deleteRDN"; //$NON-NLS-1$
+
+    private static final String AUTHMETHOD_NONE = "none"; //$NON-NLS-1$
+
+    private static final String AUTHMETHOD_SIMPLE = "simple"; //$NON-NLS-1$
+
+    private static final String AUTHMETHOD_DIGEST_MD5 = "DIGEST-MD5"; //$NON-NLS-1$
+
+    private static final String AUTHMETHOD_CRAM_MD5 = "CRAM-MD5"; //$NON-NLS-1$
+
+    private static final String AUTHMETHOD_GSSAPI = "GSSAPI"; //$NON-NLS-1$
+
+    private static final String NO_CONNECTION = "No connection"; //$NON-NLS-1$
+
+    private static final String JAVA_NAMING_SECURITY_SASL_REALM = "java.naming.security.sasl.realm"; //$NON-NLS-1$
+
+    private static final String JAVA_NAMING_LDAP_FACTORY_SOCKET = "java.naming.ldap.factory.socket"; //$NON-NLS-1$
+
+    private static final String COM_SUN_JNDI_DNS_TIMEOUT_RETRIES = "com.sun.jndi.dns.timeout.retries"; //$NON-NLS-1$
+
+    private static final String COM_SUN_JNDI_DNS_TIMEOUT_INITIAL = "com.sun.jndi.dns.timeout.initial"; //$NON-NLS-1$
+
+    private static final String COM_SUN_JNDI_LDAP_CONNECT_TIMEOUT = "com.sun.jndi.ldap.connect.timeout"; //$NON-NLS-1$
+
+    private static final String JAVA_NAMING_LDAP_VERSION = "java.naming.ldap.version"; //$NON-NLS-1$
+
+    private static final String JAVA_NAMING_LDAP_DEREF_ALIASES = "java.naming.ldap.derefAliases"; //$NON-NLS-1$
+
+    private static final String JAVA_NAMING_LDAP_ATTRIBUTES_BINARY = "java.naming.ldap.attributes.binary"; //$NON-NLS-1$
+
     private static int SEARCH_RESQUEST_NUM = 0;
 
     private Connection connection;
@@ -115,25 +146,25 @@
     private Collection<String> binaryAttributes;
 
     /** JNDI constant for "throw" referrals handling */
-    public static final String REFERRAL_THROW = "throw";
+    public static final String REFERRAL_THROW = "throw"; //$NON-NLS-1$
 
     /** JNDI constant for "follow" referrals handling */
-    public static final String REFERRAL_FOLLOW = "follow";
+    public static final String REFERRAL_FOLLOW = "follow"; //$NON-NLS-1$
 
     /** JNDI constant for "ignore" referrals handling */
-    public static final String REFERRAL_IGNORE = "ignore";
+    public static final String REFERRAL_IGNORE = "ignore"; //$NON-NLS-1$
 
     /** JNDI constant for "searching" alias dereferencing */
-    public static final String ALIAS_SEARCHING = "searching";
+    public static final String ALIAS_SEARCHING = "searching"; //$NON-NLS-1$
 
     /** JNDI constant for "finding" alias dereferencing */
-    public static final String ALIAS_FINDING = "finding";
+    public static final String ALIAS_FINDING = "finding"; //$NON-NLS-1$
 
     /** JNDI constant for "always" alias dereferencing */
-    public static final String ALIAS_ALWAYS = "always";
+    public static final String ALIAS_ALWAYS = "always"; //$NON-NLS-1$
 
     /** JNDI constant for "never" alias dereferencing */
-    public static final String ALIAS_NEVER = "never";
+    public static final String ALIAS_NEVER = "never"; //$NON-NLS-1$
 
 
     /**
@@ -239,22 +270,22 @@
     public void setBinaryAttributes( Collection<String> binaryAttributes )
     {
         this.binaryAttributes = binaryAttributes;
-        String binaryAttributesString = "";
+        String binaryAttributesString = StringUtils.EMPTY;
         for ( String string : binaryAttributes )
         {
-            binaryAttributesString += string + " ";
+            binaryAttributesString += string + ' ';
         }
 
         if ( environment != null )
         {
-            environment.put( "java.naming.ldap.attributes.binary", binaryAttributesString );
+            environment.put( JAVA_NAMING_LDAP_ATTRIBUTES_BINARY, binaryAttributesString );
         }
 
         if ( context != null )
         {
             try
             {
-                context.addToEnvironment( "java.naming.ldap.attributes.binary", binaryAttributesString );
+                context.addToEnvironment( JAVA_NAMING_LDAP_ATTRIBUTES_BINARY, binaryAttributesString );
             }
             catch ( NamingException e )
             {
@@ -300,8 +331,8 @@
                     LdapContext searchCtx = context.newInstance( localControls );
 
                     // translate alias dereferencing method
-                    searchCtx.addToEnvironment(
-                        "java.naming.ldap.derefAliases", translateDerefAliasMethod( aliasesDereferencingMethod ) ); //$NON-NLS-1$
+                    searchCtx.addToEnvironment( JAVA_NAMING_LDAP_DEREF_ALIASES,
+                        translateDerefAliasMethod( aliasesDereferencingMethod ) );
 
                     // use "throw" as we handle referrals manually
                     searchCtx.addToEnvironment( Context.REFERRAL, REFERRAL_THROW );
@@ -440,7 +471,7 @@
     {
         if ( connection.isReadOnly() )
         {
-            monitor.reportError( "Connection '" + connection.getName() + "' is read only." );
+            monitor.reportError( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) );
             return;
         }
 
@@ -531,7 +562,7 @@
     {
         if ( connection.isReadOnly() )
         {
-            monitor.reportError( "Connection '" + connection.getName() + "' is read only." );
+            monitor.reportError( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) );
             return;
         }
 
@@ -553,11 +584,11 @@
                     // delete old RDN
                     if ( deleteOldRdn )
                     {
-                        modCtx.addToEnvironment( "java.naming.ldap.deleteRDN", "true" ); //$NON-NLS-1$ //$NON-NLS-2$
+                        modCtx.addToEnvironment( JAVA_NAMING_LDAP_DELETE_RDN, "true" ); //$NON-NLS-1$
                     }
                     else
                     {
-                        modCtx.addToEnvironment( "java.naming.ldap.deleteRDN", "false" ); //$NON-NLS-1$ //$NON-NLS-2$
+                        modCtx.addToEnvironment( JAVA_NAMING_LDAP_DELETE_RDN, "false" ); //$NON-NLS-1$
                     }
 
                     // rename entry
@@ -631,7 +662,7 @@
     {
         if ( connection.isReadOnly() )
         {
-            monitor.reportError( "Connection '" + connection.getName() + "' is read only." );
+            monitor.reportError( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) );
             return;
         }
 
@@ -719,7 +750,7 @@
     {
         if ( connection.isReadOnly() )
         {
-            monitor.reportError( "Connection '" + connection.getName() + "' is read only." );
+            monitor.reportError( NLS.bind( Messages.error__connection_is_readonly, connection.getName() ) );
             return;
         }
 
@@ -809,28 +840,28 @@
         Preferences preferences = ConnectionCorePlugin.getDefault().getPluginPreferences();
         String ldapCtxFactory = preferences.getString( ConnectionCoreConstants.PREFERENCE_LDAP_CONTEXT_FACTORY );
         environment.put( Context.INITIAL_CONTEXT_FACTORY, ldapCtxFactory ); //$NON-NLS-1$
-        environment.put( "java.naming.ldap.version", "3" ); //$NON-NLS-1$ //$NON-NLS-2$
+        environment.put( JAVA_NAMING_LDAP_VERSION, "3" ); //$NON-NLS-1$
 
         // timeouts
         // Don't use a timeout when using ldaps: JNDI throws a SocketException 
         // when setting a timeout on SSL connections.
         if ( !useLdaps )
         {
-            environment.put( "com.sun.jndi.ldap.connect.timeout", "10000" ); //$NON-NLS-1$ //$NON-NLS-2$
+            environment.put( COM_SUN_JNDI_LDAP_CONNECT_TIMEOUT, "10000" ); //$NON-NLS-1$
         }
-        environment.put( "com.sun.jndi.dns.timeout.initial", "2000" ); //$NON-NLS-1$ //$NON-NLS-2$
-        environment.put( "com.sun.jndi.dns.timeout.retries", "3" ); //$NON-NLS-1$ //$NON-NLS-2$
+        environment.put( COM_SUN_JNDI_DNS_TIMEOUT_INITIAL, "2000" ); //$NON-NLS-1$
+        environment.put( COM_SUN_JNDI_DNS_TIMEOUT_RETRIES, "3" ); //$NON-NLS-1$
 
         // ldaps://
         if ( useLdaps )
         {
-            environment.put( Context.PROVIDER_URL, "ldaps://" + host + ":" + port ); //$NON-NLS-1$ //$NON-NLS-2$
+            environment.put( Context.PROVIDER_URL, LdapURL.LDAPS_SCHEME + host + ':' + port );
             environment.put( Context.SECURITY_PROTOCOL, "ssl" ); //$NON-NLS-1$
-            environment.put( "java.naming.ldap.factory.socket", DummySSLSocketFactory.class.getName() ); //$NON-NLS-1$
+            environment.put( JAVA_NAMING_LDAP_FACTORY_SOCKET, DummySSLSocketFactory.class.getName() );
         }
         else
         {
-            environment.put( Context.PROVIDER_URL, "ldap://" + host + ":" + port ); //$NON-NLS-1$ //$NON-NLS-2$
+            environment.put( Context.PROVIDER_URL, LdapURL.LDAP_SCHEME + host + ':' + port );
         }
 
         if ( binaryAttributes != null )
@@ -900,23 +931,23 @@
         if ( context != null && isConnected )
         {
             // setup authentication methdod
-            authMethod = "none";
+            authMethod = AUTHMETHOD_NONE;
             if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SIMPLE )
             {
-                authMethod = "simple";
+                authMethod = AUTHMETHOD_SIMPLE;
             }
             else if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SASL_DIGEST_MD5 )
             {
-                authMethod = "DIGEST-MD5";
+                authMethod = AUTHMETHOD_DIGEST_MD5;
                 saslRealm = connection.getConnectionParameter().getSaslRealm();
             }
             else if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SASL_CRAM_MD5 )
             {
-                authMethod = "CRAM-MD5";
+                authMethod = AUTHMETHOD_CRAM_MD5;
             }
             else if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SASL_GSSAPI )
             {
-                authMethod = "GSSAPI";
+                authMethod = AUTHMETHOD_GSSAPI;
             }
 
             // setup credentials
@@ -953,7 +984,7 @@
                         context.removeFromEnvironment( Context.SECURITY_AUTHENTICATION );
                         context.removeFromEnvironment( Context.SECURITY_PRINCIPAL );
                         context.removeFromEnvironment( Context.SECURITY_CREDENTIALS );
-                        context.removeFromEnvironment( "java.naming.security.sasl.realm" );
+                        context.removeFromEnvironment( JAVA_NAMING_SECURITY_SASL_REALM );
 
                         context.addToEnvironment( Context.SECURITY_PRINCIPAL, bindPrincipal );
                         context.addToEnvironment( Context.SECURITY_CREDENTIALS, bindCredentials );
@@ -962,7 +993,7 @@
                         if ( connection.getConnectionParameter().getAuthMethod() == ConnectionParameter.AuthenticationMethod.SASL_DIGEST_MD5
                             && StringUtils.isNotEmpty( saslRealm ) )
                         {
-                            context.addToEnvironment( "java.naming.security.sasl.realm", saslRealm );
+                            context.addToEnvironment( JAVA_NAMING_SECURITY_SASL_REALM, saslRealm );
                         }
                         context.reconnect( context.getConnectControls() );
                     }
@@ -991,7 +1022,7 @@
         }
         else
         {
-            throw new NamingException( "No connection" );
+            throw new NamingException( NO_CONNECTION );
         }
     }
 
@@ -1007,7 +1038,7 @@
         }
         if ( context == null )
         {
-            throw new NamingException( "No connection" );
+            throw new NamingException( NO_CONNECTION );
         }
 
         // loop for reconnection
@@ -1151,21 +1182,21 @@
      */
     private String translateDerefAliasMethod( AliasDereferencingMethod aliasDereferencingMethod )
     {
-        String m = ALIAS_ALWAYS; //$NON-NLS-1$
+        String m = ALIAS_ALWAYS;
 
         switch ( aliasDereferencingMethod )
         {
             case NEVER:
-                m = ALIAS_NEVER; //$NON-NLS-1$
+                m = ALIAS_NEVER;
                 break;
             case ALWAYS:
-                m = ALIAS_ALWAYS; //$NON-NLS-1$
+                m = ALIAS_ALWAYS;
                 break;
             case FINDING:
-                m = ALIAS_FINDING; //$NON-NLS-1$
+                m = ALIAS_FINDING;
                 break;
             case SEARCH:
-                m = ALIAS_SEARCHING; //$NON-NLS-1$
+                m = ALIAS_SEARCHING;
                 break;
         }
 
@@ -1252,7 +1283,7 @@
      */
     private Name getSaveJndiName( String name ) throws InvalidNameException
     {
-        if ( name == null || "".equals( name ) )
+        if ( name == null || StringUtils.isEmpty( name ) ) //$NON-NLS-1$
         {
             return new CompositeName();
         }
@@ -1331,7 +1362,7 @@
             try
             {
                 Context ctx = referralException.getReferralContext();
-                ctx.list( "" ); //$NON-NLS-1$
+                ctx.list( StringUtils.EMPTY ); //$NON-NLS-1$
             }
             catch ( NamingException ne )
             {

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDISubentriesControl.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDISubentriesControl.java?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDISubentriesControl.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDISubentriesControl.java Fri Feb  6 23:03:06 2009
@@ -38,7 +38,7 @@
     /**
      * The Subentries control's OID is 1.3.6.1.4.1.4203.1.10.1.
      */
-    public static final String OID = "1.3.6.1.4.1.4203.1.10.1";
+    public static final String OID = "1.3.6.1.4.1.4203.1.10.1"; //$NON-NLS-1$
 
     /**
      * The Subentries control's value.

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifModificationLogger.java Fri Feb  6 23:03:06 2009
@@ -290,7 +290,7 @@
                     Object o = valueEnumeration.next();
                     if ( maskedAttributes.contains( attributeName.toLowerCase() ) )
                     {
-                        record.addAttrVal( LdifAttrValLine.create( attributeName, "**********" ) );
+                        record.addAttrVal( LdifAttrValLine.create( attributeName, "**********" ) ); //$NON-NLS-1$
                     }
                     else
                     {
@@ -379,7 +379,7 @@
                     Object o = valueEnumeration.next();
                     if ( maskedAttributes.contains( attributeDescription.toLowerCase() ) )
                     {
-                        modSpec.addAttrVal( LdifAttrValLine.create( attributeDescription, "**********" ) );
+                        modSpec.addAttrVal( LdifAttrValLine.create( attributeDescription, "**********" ) ); //$NON-NLS-1$
                     }
                     else
                     {
@@ -622,7 +622,7 @@
 
         String maskedAttributeString = ConnectionCorePlugin.getDefault().getPluginPreferences().getString(
             ConnectionCoreConstants.PREFERENCE_MODIFICATIONLOGS_MASKED_ATTRIBUTES );
-        String[] splitted = maskedAttributeString.split( "," );
+        String[] splitted = maskedAttributeString.split( "," ); //$NON-NLS-1$
         for ( String s : splitted )
         {
             maskedAttributes.add( s.toLowerCase() );

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifSearchLogger.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifSearchLogger.java?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifSearchLogger.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/LdifSearchLogger.java Fri Feb  6 23:03:06 2009
@@ -221,12 +221,12 @@
             if ( ex != null )
             {
                 logger.log( Level.ALL, LdifCommentLine
-                    .create( "#!" + type + " ERROR" ).toFormattedString( LdifFormatParameters.DEFAULT ) ); //$NON-NLS-1$
+                    .create( "#!" + type + " ERROR" ).toFormattedString( LdifFormatParameters.DEFAULT ) ); //$NON-NLS-1$ //$NON-NLS-2$
             }
             else
             {
                 logger.log( Level.ALL, LdifCommentLine
-                    .create( "#!" + type + " OK" ).toFormattedString( LdifFormatParameters.DEFAULT ) ); //$NON-NLS-1$
+                    .create( "#!" + type + " OK" ).toFormattedString( LdifFormatParameters.DEFAULT ) ); //$NON-NLS-1$ //$NON-NLS-2$
             }
 
             logger
@@ -303,15 +303,15 @@
             return;
         }
 
-        String scopeAsString = searchControls.getSearchScope() == SearchControls.SUBTREE_SCOPE ? "wholeSubtree (2)"
-            : searchControls.getSearchScope() == SearchControls.ONELEVEL_SCOPE ? "singleLevel (1)" : "baseObject (0)";
-        String attributesAsString = searchControls.getReturningAttributes() == null ? "*" : searchControls
-            .getReturningAttributes().length == 0 ? "1.1" : StringUtils.join( searchControls.getReturningAttributes(),
-            " " );
-        String aliasAsString = aliasesDereferencingMethod == AliasDereferencingMethod.ALWAYS ? "derefAlways (3)"
-            : aliasesDereferencingMethod == AliasDereferencingMethod.FINDING ? "derefFindingBaseObj (2)"
-                : aliasesDereferencingMethod == AliasDereferencingMethod.SEARCH ? "derefInSearching (1)"
-                    : "neverDerefAliases (0)";
+        String scopeAsString = searchControls.getSearchScope() == SearchControls.SUBTREE_SCOPE ? "wholeSubtree (2)" //$NON-NLS-1$
+            : searchControls.getSearchScope() == SearchControls.ONELEVEL_SCOPE ? "singleLevel (1)" : "baseObject (0)"; //$NON-NLS-1$ //$NON-NLS-2$
+        String attributesAsString = searchControls.getReturningAttributes() == null ? "*" : searchControls //$NON-NLS-1$
+            .getReturningAttributes().length == 0 ? "1.1" : StringUtils.join( searchControls.getReturningAttributes(), //$NON-NLS-1$
+            " " ); //$NON-NLS-1$
+        String aliasAsString = aliasesDereferencingMethod == AliasDereferencingMethod.ALWAYS ? "derefAlways (3)" //$NON-NLS-1$
+            : aliasesDereferencingMethod == AliasDereferencingMethod.FINDING ? "derefFindingBaseObj (2)" //$NON-NLS-1$
+                : aliasesDereferencingMethod == AliasDereferencingMethod.SEARCH ? "derefInSearching (1)" //$NON-NLS-1$
+                    : "neverDerefAliases (0)"; //$NON-NLS-1$
 
         // build LDAP URL
         LdapURL url = Utils.getLdapURL( connection, searchBase, searchControls.getSearchScope(), filter, searchControls
@@ -324,32 +324,32 @@
 
         // build 
         Collection<LdifLineBase> lines = new ArrayList<LdifLineBase>();
-        lines.add( LdifCommentLine.create( "# LDAP URL     : " + url.toString() ) );
-        lines.add( LdifCommentLine.create( "# command line : " + cmdLine.toString() ) );
-        lines.add( LdifCommentLine.create( "# baseObject   : " + searchBase ) );
-        lines.add( LdifCommentLine.create( "# scope        : " + scopeAsString ) );
-        lines.add( LdifCommentLine.create( "# derefAliases : " + aliasAsString ) );
-        lines.add( LdifCommentLine.create( "# sizeLimit    : " + searchControls.getCountLimit() ) );
-        lines.add( LdifCommentLine.create( "# timeLimit    : " + searchControls.getTimeLimit() ) );
-        lines.add( LdifCommentLine.create( "# typesOnly    : " + "False" ) );
-        lines.add( LdifCommentLine.create( "# filter       : " + filter ) );
-        lines.add( LdifCommentLine.create( "# attributes   : " + attributesAsString ) );
+        lines.add( LdifCommentLine.create( "# LDAP URL     : " + url.toString() ) ); //$NON-NLS-1$
+        lines.add( LdifCommentLine.create( "# command line : " + cmdLine.toString() ) ); //$NON-NLS-1$
+        lines.add( LdifCommentLine.create( "# baseObject   : " + searchBase ) ); //$NON-NLS-1$
+        lines.add( LdifCommentLine.create( "# scope        : " + scopeAsString ) ); //$NON-NLS-1$
+        lines.add( LdifCommentLine.create( "# derefAliases : " + aliasAsString ) ); //$NON-NLS-1$
+        lines.add( LdifCommentLine.create( "# sizeLimit    : " + searchControls.getCountLimit() ) ); //$NON-NLS-1$
+        lines.add( LdifCommentLine.create( "# timeLimit    : " + searchControls.getTimeLimit() ) ); //$NON-NLS-1$
+        lines.add( LdifCommentLine.create( "# typesOnly    : " + "False" ) ); //$NON-NLS-1$ //$NON-NLS-2$
+        lines.add( LdifCommentLine.create( "# filter       : " + filter ) ); //$NON-NLS-1$
+        lines.add( LdifCommentLine.create( "# attributes   : " + attributesAsString ) ); //$NON-NLS-1$
         if ( controls != null )
         {
             for ( Control control : controls )
             {
-                lines.add( LdifCommentLine.create( "# control      : " + control.getID() ) );
+                lines.add( LdifCommentLine.create( "# control      : " + control.getID() ) ); //$NON-NLS-1$
             }
         }
         lines.add( LdifSepLine.create() );
 
-        String formattedString = "";
+        String formattedString = ""; //$NON-NLS-1$
         for ( LdifLineBase line : lines )
         {
             formattedString += line.toFormattedString( LdifFormatParameters.DEFAULT );
         }
 
-        log( formattedString, "SEARCH REQUEST (" + requestNum + ")", ex, connection );
+        log( formattedString, "SEARCH REQUEST (" + requestNum + ")", ex, connection ); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
 
@@ -400,7 +400,7 @@
                 formattedString = LdifFormatParameters.DEFAULT.getLineSeparator();
             }
 
-            log( formattedString, "SEARCH RESULT ENTRY (" + requestNum + ")", ex, connection );
+            log( formattedString, "SEARCH RESULT ENTRY (" + requestNum + ")", ex, connection ); //$NON-NLS-1$ //$NON-NLS-2$
         }
         catch ( NamingException e )
         {
@@ -420,15 +420,15 @@
         }
 
         Collection<LdifLineBase> lines = new ArrayList<LdifLineBase>();
-        lines.add( LdifCommentLine.create( "# reference : " + ( urlAndDn != null ? urlAndDn.getUrl() : "null" ) ) );
+        lines.add( LdifCommentLine.create( "# reference : " + ( urlAndDn != null ? urlAndDn.getUrl() : "null" ) ) ); //$NON-NLS-1$ //$NON-NLS-2$
         lines.add( LdifSepLine.create() );
 
-        String formattedString = "";
+        String formattedString = ""; //$NON-NLS-1$
         for ( LdifLineBase line : lines )
         {
             formattedString += line.toFormattedString( LdifFormatParameters.DEFAULT );
         }
-        log( formattedString, "SEARCH RESULT REFERENCE (" + requestNum + ")", ex, connection );
+        log( formattedString, "SEARCH RESULT REFERENCE (" + requestNum + ")", ex, connection ); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
 
@@ -443,15 +443,15 @@
         }
 
         Collection<LdifLineBase> lines = new ArrayList<LdifLineBase>();
-        lines.add( LdifCommentLine.create( "# numEntries : " + count ) );
+        lines.add( LdifCommentLine.create( "# numEntries : " + count ) ); //$NON-NLS-1$
         lines.add( LdifSepLine.create() );
 
-        String formattedString = "";
+        String formattedString = ""; //$NON-NLS-1$
         for ( LdifLineBase line : lines )
         {
             formattedString += line.toFormattedString( LdifFormatParameters.DEFAULT );
         }
-        log( formattedString, "SEARCH RESULT DONE (" + requestNum + ")", ex, connection );
+        log( formattedString, "SEARCH RESULT DONE (" + requestNum + ")", ex, connection ); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
 

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ReferralsInfo.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ReferralsInfo.java?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ReferralsInfo.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ReferralsInfo.java Fri Feb  6 23:03:06 2009
@@ -27,6 +27,8 @@
 
 import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.studio.connection.core.Messages;
+import org.eclipse.osgi.util.NLS;
 
 
 /**
@@ -74,7 +76,7 @@
         }
         else
         {
-            throw new LinkLoopException( "Loop detected while following referral: " + url );
+            throw new LinkLoopException( NLS.bind( Messages.error__loop_detected, url ) );
         }
     }
 
@@ -120,11 +122,11 @@
         {
             if ( url == null )
             {
-                throw new IllegalArgumentException( "URL may not be null" );
+                throw new IllegalArgumentException( "URL may not be null" ); //$NON-NLS-1$
             }
             if ( dn == null )
             {
-                throw new IllegalArgumentException( "DN may not be null" );
+                throw new IllegalArgumentException( "DN may not be null" ); //$NON-NLS-1$
             }
             this.url = url;
             this.dn = dn;

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java Fri Feb  6 23:03:06 2009
@@ -276,14 +276,14 @@
 
     private static String getLockIdentifier( Connection connection )
     {
-        return connection.getHost() + ":" + connection.getPort();
+        return connection.getHost() + ':' + connection.getPort();
     }
 
 
     private static String getLockIdentifier( Object object )
     {
-        String s = object != null ? object.toString() : "null";
-        s = "-" + s;
+        String s = object != null ? object.toString() : "null"; //$NON-NLS-1$
+        s = '-' + s;
         return s;
     }
 

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/messages.properties?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/messages.properties (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/messages.properties Fri Feb  6 23:03:06 2009
@@ -16,13 +16,20 @@
 #  under the License.
 
 copy_n_of_s=Copy {0}of {1}
+error__execute_connection_initializer=Exception occured while executing connection initializer.  
+error__invalid_rdn=RDN is invalid
+error__saving_connections=Error while saving connections.
+error__loading_connections=Error while loading connections.
+error__unable_to_create_connection_listener=Unable to create connection listener. 
+error__unable_to_create_jndi_logger=Unable to create JNDI logger.
+error__unable_to_get_plugin_properties=Unable to get the plugin properties.
+error__loop_detected=Loop detected while following referral: {0} 
+error__connection_is_readonly=Connection '{0}' is read only.
 
 model__no_auth_handler=No authentification handler
 model__no_credentials=No credentials
 
-jobs__error_occurred=Error occurred
 jobs__progressmonitor_check_cancellation=Check Cancellation
-jobs__progressmonitor_report_progress=Report Progress
 
 jobs__check_bind_name=Check Authentication
 jobs__check_bind_task=Checking authentication

Modified: directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/messages_de.properties?rev=741773&r1=741772&r2=741773&view=diff
==============================================================================
--- directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/messages_de.properties (original)
+++ directory/studio/trunk/connection-core/src/main/java/org/apache/directory/studio/connection/core/messages_de.properties Fri Feb  6 23:03:06 2009
@@ -16,13 +16,19 @@
 #  under the License.
 
 copy_n_of_s=Kopie {0}von {1}
+error__execute_connection_initializer=Fehler bei der Ausf\u00FChrung des Verbindungs Initialisierers aufgetreten. 
+error__invalid_rdn=RDN ist ung\u00FCltig
+error__saving_connections=Fehler beim Speichern der Verbindungen aufgetreten.
+error__loading_connections=Fehler beim Laden der Verbindungen aufgetreten.
+error__unable_to_create_connection_listener=Connection Listener konnte nicht initialisiert werden.
+error__unable_to_create_jndi_logger=JNDI Logger konnte nicht initialisiert werden
+error__unable_to_get_plugin_properties=Plugin properties nicht gefunden.
+error__connection_is_readonly=Verbindung '{0}' ist schreibgesch\u00FCtzt."
 
 model__no_auth_handler=Kein Authentifizierungs-Handhaber
 model__no_credentials=Keine Anmeldeinformationen
 
-jobs__error_occurred=Es ist ein Fehler aufgetreten
 jobs__progressmonitor_check_cancellation=Abbruch \u00FCberpr\u00FCfen
-jobs__progressmonitor_report_progress=Fortschritts-Report
 
 jobs__check_bind_name=Authentifizierung \u00FCberpr\u00FCfen
 jobs__check_bind_task=Authentifizierung \u00FCberpr\u00FCfen



Mime
View raw message