You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2013/04/29 17:38:44 UTC

svn commit: r1477154 - in /directory/studio/trunk/plugins: ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ ldapservers/src/main/java/org/apache/directory/studio/ldapservers/

Author: pamarcelot
Date: Mon Apr 29 15:38:43 2013
New Revision: 1477154

URL: http://svn.apache.org/r1477154
Log:
Fix for DIRSTUDIO-904 (Directory Studio create files with french 'accents').

Modified:
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages.properties
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages_de.properties
    directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages_fr.properties
    directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java
    directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages.properties
    directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages_de.properties
    directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages_fr.properties

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java?rev=1477154&r1=1477153&r2=1477154&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/ApacheDS200LdapServerAdapter.java Mon Apr 29 15:38:43 2013
@@ -203,9 +203,7 @@ public class ApacheDS200LdapServerAdapte
         // Creating a new editable launch configuration
         ILaunchConfigurationType type = DebugPlugin.getDefault().getLaunchManager()
             .getLaunchConfigurationType( IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION );
-        ILaunchConfigurationWorkingCopy workingCopy = type.newInstance( null,
-            NLS.bind( Messages.getString( "ApacheDS200LdapServerAdapter.Starting" ), new String[] //$NON-NLS-1$
-                { server.getName() } ) );
+        ILaunchConfigurationWorkingCopy workingCopy = type.newInstance( null, server.getId() );
 
         // Setting the JRE container path attribute
         workingCopy.setAttribute( IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, vmInstall

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages.properties?rev=1477154&r1=1477153&r2=1477154&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages.properties (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages.properties Mon Apr 29 15:38:43 2013
@@ -17,7 +17,6 @@
 
 ApacheDS200Plugin.UnableGetPluginProperties=Unable to get the plugin properties.
 
-ApacheDS200LdapServerAdapter.Starting=Starting {0}...
 ApacheDS200LdapServerAdapter.LDAPPort=LDAP (port {0})
 ApacheDS200LdapServerAdapter.LDAPSPort=LDAPS (port {0})
 ApacheDS200LdapServerAdapter.KerberosPort=Kerberos (port {0})

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages_de.properties?rev=1477154&r1=1477153&r2=1477154&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages_de.properties (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages_de.properties Mon Apr 29 15:38:43 2013
@@ -17,7 +17,6 @@
 
 ApacheDS200Plugin.UnableGetPluginProperties=Die Plugin Eigenschaften k\u00F6nnen nicht geladen werden.
 
-ApacheDS200LdapServerAdapter.Starting=Startend {0}...
 ApacheDS200LdapServerAdapter.CopyingConfigurationFiles=Kopiere Konfigurationsdateien
 ApacheDS200LdapServerAdapter.CreatingServerFolderStructure=Erstelle Verzeichnisstruktur
 ApacheDS200LdapServerAdapter.VerifyingAndCopyingLibraries=Verifiziere und kopiere ApacheDS 2.0.0

Modified: directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages_fr.properties?rev=1477154&r1=1477153&r2=1477154&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages_fr.properties (original)
+++ directory/studio/trunk/plugins/ldapservers.apacheds.v200/src/main/java/org/apache/directory/studio/ldapservers/apacheds/v200/messages_fr.properties Mon Apr 29 15:38:43 2013
@@ -17,7 +17,6 @@
 
 ApacheDS200Plugin.UnableGetPluginProperties=Impossible de r\u00E9cup\u00E9rer les propri\u00E9t\u00E9s de ce plugin
 
-ApacheDS200LdapServerAdapter.Starting=D\u00E9marrage du serveur {0}...
 ApacheDS200LdapServerAdapter.CopyingConfigurationFiles=copie des fichiers de configuration
 ApacheDS200LdapServerAdapter.CreatingServerFolderStructure=création de la structure de dossiers du serveur
 ApacheDS200LdapServerAdapter.VerifyingAndCopyingLibraries=vérification et copie des bibliothèques d'ApacheDS 2.0.0

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java?rev=1477154&r1=1477153&r2=1477154&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/LdapServersUtils.java Mon Apr 29 15:38:43 2013
@@ -272,9 +272,7 @@ public class LdapServersUtils
         // Creating a new editable launch configuration
         ILaunchConfigurationType type = DebugPlugin.getDefault().getLaunchManager()
             .getLaunchConfigurationType( IJavaLaunchConfigurationConstants.ID_JAVA_APPLICATION );
-        ILaunchConfigurationWorkingCopy workingCopy = type.newInstance( null,
-            NLS.bind( Messages.getString( "LdapServersUtils.Starting" ), new String[] //$NON-NLS-1$
-                { server.getName() } ) );
+        ILaunchConfigurationWorkingCopy workingCopy = type.newInstance( null, server.getId() );
 
         // Setting the JRE container path attribute
         workingCopy.setAttribute( IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, vmInstall

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages.properties?rev=1477154&r1=1477153&r2=1477154&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages.properties (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages.properties Mon Apr 29 15:38:43 2013
@@ -25,4 +25,3 @@ LdapServersManagerIO.ErrorNotValidServer
 
 LdapServersUtils.AssociatedLaunchConfigurationCouldNotBeFoundOrTerminated=The associated launch configuration could not be found or is already terminated.
 LdapServersUtils.ErrorCopyingLibrary=An error occurred when copying the library ''{0}'' to the location ''{1}''.\n\n{2}
-LdapServersUtils.Starting=Starting {0}...

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages_de.properties?rev=1477154&r1=1477153&r2=1477154&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages_de.properties (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages_de.properties Mon Apr 29 15:38:43 2013
@@ -25,4 +25,3 @@ LdapServersManagerIO.ErrorNotValidServer
 
 LdapServersUtils.AssociatedLaunchConfigurationCouldNotBeFoundOrTerminated=Die zugeh\u00F6rige Startkonfiguration konnte nicht gefunden werden oder wurde bereits beendet.
 LdapServersUtils.ErrorCopyingLibrary=Ein Fehler ist beim Kopieren der Datei ''{0}'' nach ''{1}'' aufgetreten.\n\n{2}
-LdapServersUtils.Starting=Startend {0}...

Modified: directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages_fr.properties?rev=1477154&r1=1477153&r2=1477154&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages_fr.properties (original)
+++ directory/studio/trunk/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/messages_fr.properties Mon Apr 29 15:38:43 2013
@@ -25,4 +25,3 @@ LdapServersManagerIO.ErrorNotValidServer
 
 LdapServersUtils.AssociatedLaunchConfigurationCouldNotBeFoundOrTerminated=La configuration de lancement associée n'a pu être trouvée ou est déjà arrêtée.
 LdapServersUtils.ErrorCopyingLibrary=Une erreur est survenue lors de la copie de la bibliothèque ''{0}'' à l'emplacement ''{1}''.\n\n{2}
-LdapServersUtils.Starting=D\u00E9marrage du serveur {0}...