directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1228064 - in /directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds: ApacheDsPlugin.java ApacheDsPluginConstants.java ApacheDsPluginUtils.java ConsolesHandler.java PreferenceInitializer.java
Date Fri, 06 Jan 2012 10:34:48 GMT
Author: pamarcelot
Date: Fri Jan  6 10:34:47 2012
New Revision: 1228064

URL: http://svn.apache.org/viewvc?rev=1228064&view=rev
Log:
Marked strings as non-externalized.

Modified:
    directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
    directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
    directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java
    directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ConsolesHandler.java
    directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/PreferenceInitializer.java

Modified: directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java?rev=1228064&r1=1228063&r2=1228064&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java (original)
+++ directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPlugin.java Fri Jan  6 10:34:47 2012
@@ -160,14 +160,14 @@ public class ApacheDsPlugin extends Abst
             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.apacheds", Status.OK,
+                    new Status( Status.ERROR, "org.apache.directory.studio.apacheds", Status.OK, //$NON-NLS-1$
                         "Unable to get the plugin properties.", e ) );
             }
         }

Modified: directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java?rev=1228064&r1=1228063&r2=1228064&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java (original)
+++ directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginConstants.java Fri Jan  6 10:34:47 2012
@@ -38,103 +38,103 @@ public final class ApacheDsPluginConstan
     }
 
     /** The plug-in ID */
-    public static final String PLUGIN_ID = ApacheDsPlugin.getDefault().getPluginProperties().getString( "Plugin_id" );
+    public static final String PLUGIN_ID = ApacheDsPlugin.getDefault().getPluginProperties().getString( "Plugin_id" ); //$NON-NLS-1$
 
     // ------
     // IMAGES
     // ------
-    public static final String IMG_SERVER_NEW = "resources/icons/server_new.gif";
-    public static final String IMG_SERVER_NEW_WIZARD = "resources/icons/server_new_wizard.png";
-    public static final String IMG_SERVER = "resources/icons/server.gif";
-    public static final String IMG_SERVER_STARTED = "resources/icons/server_started.gif";
-    public static final String IMG_SERVER_STARTING1 = "resources/icons/server_starting1.gif";
-    public static final String IMG_SERVER_STARTING2 = "resources/icons/server_starting2.gif";
-    public static final String IMG_SERVER_STARTING3 = "resources/icons/server_starting3.gif";
-    public static final String IMG_SERVER_STOPPED = "resources/icons/server_stopped.gif";
-    public static final String IMG_SERVER_STOPPING1 = "resources/icons/server_stopping1.gif";
-    public static final String IMG_SERVER_STOPPING2 = "resources/icons/server_stopping2.gif";
-    public static final String IMG_SERVER_STOPPING3 = "resources/icons/server_stopping3.gif";
-    public static final String IMG_RUN = "resources/icons/run.gif";
-    public static final String IMG_STOP = "resources/icons/stop.gif";
-    public static final String IMG_CREATE_CONNECTION = "resources/icons/connection_new.gif";
+    public static final String IMG_SERVER_NEW = "resources/icons/server_new.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_NEW_WIZARD = "resources/icons/server_new_wizard.png"; //$NON-NLS-1$
+    public static final String IMG_SERVER = "resources/icons/server.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STARTED = "resources/icons/server_started.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STARTING1 = "resources/icons/server_starting1.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STARTING2 = "resources/icons/server_starting2.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STARTING3 = "resources/icons/server_starting3.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STOPPED = "resources/icons/server_stopped.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STOPPING1 = "resources/icons/server_stopping1.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STOPPING2 = "resources/icons/server_stopping2.gif"; //$NON-NLS-1$
+    public static final String IMG_SERVER_STOPPING3 = "resources/icons/server_stopping3.gif"; //$NON-NLS-1$
+    public static final String IMG_RUN = "resources/icons/run.gif"; //$NON-NLS-1$
+    public static final String IMG_STOP = "resources/icons/stop.gif"; //$NON-NLS-1$
+    public static final String IMG_CREATE_CONNECTION = "resources/icons/connection_new.gif"; //$NON-NLS-1$
 
     // --------
     // COMMANDS
     // --------
     public static final String CMD_NEW_SERVER = ApacheDsPlugin.getDefault().getPluginProperties().getString(
-        "Cmd_NewServer_id" );
-    public static final String CMD_RUN = ApacheDsPlugin.getDefault().getPluginProperties().getString( "Cmd_Run_id" );
-    public static final String CMD_STOP = ApacheDsPlugin.getDefault().getPluginProperties().getString( "Cmd_Stop_id" );
+        "Cmd_NewServer_id" ); //$NON-NLS-1$
+    public static final String CMD_RUN = ApacheDsPlugin.getDefault().getPluginProperties().getString( "Cmd_Run_id" ); //$NON-NLS-1$
+    public static final String CMD_STOP = ApacheDsPlugin.getDefault().getPluginProperties().getString( "Cmd_Stop_id" ); //$NON-NLS-1$
     public static final String CMD_PROPERTIES = ApacheDsPlugin.getDefault().getPluginProperties().getString(
-        "Cmd_Properties_id" );
+        "Cmd_Properties_id" ); //$NON-NLS-1$
     public static final String CMD_OPEN_CONFIGURATION = ApacheDsPlugin.getDefault().getPluginProperties().getString(
-        "Cmd_OpenConfiguration_id" );
+        "Cmd_OpenConfiguration_id" ); //$NON-NLS-1$
     public static final String CMD_DELETE = ApacheDsPlugin.getDefault().getPluginProperties().getString(
-        "Cmd_Delete_id" );;
+        "Cmd_Delete_id" );; //$NON-NLS-1$
     public static final String CMD_RENAME = ApacheDsPlugin.getDefault().getPluginProperties().getString(
-        "Cmd_Rename_id" );;
+        "Cmd_Rename_id" );; //$NON-NLS-1$
     public static final String CMD_CREATE_CONNECTION = ApacheDsPlugin.getDefault().getPluginProperties().getString(
-        "Cmd_CreateConnection_id" );
+        "Cmd_CreateConnection_id" ); //$NON-NLS-1$
 
     // --------------
     // PROPERTY PAGES
     // --------------
     public static final String PROP_SERVER_PROPERTY_PAGE = ApacheDsPlugin.getDefault().getPluginProperties().getString(
-        "Prop_ServerPropertyPage_id" );
+        "Prop_ServerPropertyPage_id" ); //$NON-NLS-1$
 
     // -----
     // VIEWS
     // -----
     public static final String VIEW_SERVERS_VIEW = ApacheDsPlugin.getDefault().getPluginProperties().getString(
-        "View_ServersView_id" );
+        "View_ServersView_id" ); //$NON-NLS-1$
 
     // --------
     // CONTEXTS
     // --------
     public static final String CONTEXTS_SERVERS_VIEW = ApacheDsPlugin.getDefault().getPluginProperties().getString(
-        "Ctx_ServersView_id" );
+        "Ctx_ServersView_id" ); //$NON-NLS-1$
 
     // -----------
     // PREFERENCES
     // -----------
     /** The Preference ID for the Colors and Font Debug Font setting */
-    public static final String PREFS_COLORS_AND_FONTS_DEBUG_FONT = "prefs.colorAndFonts.debugFont";
+    public static final String PREFS_COLORS_AND_FONTS_DEBUG_FONT = "prefs.colorAndFonts.debugFont"; //$NON-NLS-1$
     /** The Preference ID for the Colors and Font Debug Color setting */
-    public static final String PREFS_COLORS_AND_FONTS_DEBUG_COLOR = "prefs.colorAndFonts.debugColor";
+    public static final String PREFS_COLORS_AND_FONTS_DEBUG_COLOR = "prefs.colorAndFonts.debugColor"; //$NON-NLS-1$
 
     /** The Preference ID for the Colors and Font Info Font setting */
-    public static final String PREFS_COLORS_AND_FONTS_INFO_FONT = "prefs.colorAndFonts.infoFont";
+    public static final String PREFS_COLORS_AND_FONTS_INFO_FONT = "prefs.colorAndFonts.infoFont"; //$NON-NLS-1$
     /** The Preference ID for the Colors and Font Info Color setting */
-    public static final String PREFS_COLORS_AND_FONTS_INFO_COLOR = "prefs.colorAndFonts.infoColor";
+    public static final String PREFS_COLORS_AND_FONTS_INFO_COLOR = "prefs.colorAndFonts.infoColor"; //$NON-NLS-1$
 
     /** The Preference ID for the Colors and Font Warn Font setting */
-    public static final String PREFS_COLORS_AND_FONTS_WARN_FONT = "prefs.colorAndFonts.warnFont";
+    public static final String PREFS_COLORS_AND_FONTS_WARN_FONT = "prefs.colorAndFonts.warnFont"; //$NON-NLS-1$
     /** The Preference ID for the Colors and Font Warn Color setting */
-    public static final String PREFS_COLORS_AND_FONTS_WARN_COLOR = "prefs.colorAndFonts.warnColor";
+    public static final String PREFS_COLORS_AND_FONTS_WARN_COLOR = "prefs.colorAndFonts.warnColor"; //$NON-NLS-1$
 
     /** The Preference ID for the Colors and Font Error Font settings */
-    public static final String PREFS_COLORS_AND_FONTS_ERROR_FONT = "prefs.colorAndFonts.errorFont";
+    public static final String PREFS_COLORS_AND_FONTS_ERROR_FONT = "prefs.colorAndFonts.errorFont"; //$NON-NLS-1$
     /** The Preference ID for the Colors and Font Error Color setting */
-    public static final String PREFS_COLORS_AND_FONTS_ERROR_COLOR = "prefs.colorAndFonts.errorColor";
+    public static final String PREFS_COLORS_AND_FONTS_ERROR_COLOR = "prefs.colorAndFonts.errorColor"; //$NON-NLS-1$
 
     /** The Preference ID for the Colors and Font Fatal Font setting */
-    public static final String PREFS_COLORS_AND_FONTS_FATAL_FONT = "prefs.colorAndFonts.fatalFont";
+    public static final String PREFS_COLORS_AND_FONTS_FATAL_FONT = "prefs.colorAndFonts.fatalFont"; //$NON-NLS-1$
     /** The Preference ID for the Colors and Font Fatal Color setting */
-    public static final String PREFS_COLORS_AND_FONTS_FATAL_COLOR = "prefs.colorAndFonts.fatalColor";
+    public static final String PREFS_COLORS_AND_FONTS_FATAL_COLOR = "prefs.colorAndFonts.fatalColor"; //$NON-NLS-1$
 
     /** The Preference ID for the Servers Logs Level setting */
-    public static final String PREFS_SERVER_LOGS_LEVEL = "prefs.serverLogs.level";
+    public static final String PREFS_SERVER_LOGS_LEVEL = "prefs.serverLogs.level"; //$NON-NLS-1$
     /** The Preference ID for the Servers Logs Level Debug value */
-    public static final String PREFS_SERVER_LOGS_LEVEL_DEBUG = "debug";
+    public static final String PREFS_SERVER_LOGS_LEVEL_DEBUG = "debug"; //$NON-NLS-1$
     /** The Preference ID for the Servers Logs Level Info value */
-    public static final String PREFS_SERVER_LOGS_LEVEL_INFO = "info";
+    public static final String PREFS_SERVER_LOGS_LEVEL_INFO = "info"; //$NON-NLS-1$
     /** The Preference ID for the Servers Logs Level Warn value */
-    public static final String PREFS_SERVER_LOGS_LEVEL_WARN = "warning";
+    public static final String PREFS_SERVER_LOGS_LEVEL_WARN = "warning"; //$NON-NLS-1$
     /** The Preference ID for the Servers Logs Level Error value */
-    public static final String PREFS_SERVER_LOGS_LEVEL_ERROR = "error";
+    public static final String PREFS_SERVER_LOGS_LEVEL_ERROR = "error"; //$NON-NLS-1$
     /** The Preference ID for the Servers Logs Level Fatal value */
-    public static final String PREFS_SERVER_LOGS_LEVEL_FATAL = "fatal";
+    public static final String PREFS_SERVER_LOGS_LEVEL_FATAL = "fatal"; //$NON-NLS-1$
 
     /** The Preference ID for the Servers Logs Pattern setting */
-    public static final String PREFS_SERVER_LOGS_PATTERN = "prefs.serverLogs.pattern";
+    public static final String PREFS_SERVER_LOGS_PATTERN = "prefs.serverLogs.pattern"; //$NON-NLS-1$
 }

Modified: directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java?rev=1228064&r1=1228063&r2=1228064&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java (original)
+++ directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ApacheDsPluginUtils.java Fri Jan  6 10:34:47 2012
@@ -49,15 +49,15 @@ import org.eclipse.jface.dialogs.Message
  */
 public class ApacheDsPluginUtils
 {
-    private static final String RESOURCES = "resources";
-    private static final String LIBS = "libs";
-    private static final String SERVERS = "servers";
+    private static final String RESOURCES = "resources"; //$NON-NLS-1$
+    private static final String LIBS = "libs"; //$NON-NLS-1$
+    private static final String SERVERS = "servers"; //$NON-NLS-1$
     /** The name of the libraries folder */
-    private static final String LIBRARIES_FOLDER_NAME = "libs";
-    private static final String APACHEDS = "apacheds";
+    private static final String LIBRARIES_FOLDER_NAME = "libs"; //$NON-NLS-1$
+    private static final String APACHEDS = "apacheds"; //$NON-NLS-1$
 
     /** The line separator */
-    public static final String LINE_SEPARATOR = System.getProperty( "line.separator" );
+    public static final String LINE_SEPARATOR = System.getProperty( "line.separator" ); //$NON-NLS-1$
 
 
     /**
@@ -80,7 +80,7 @@ public class ApacheDsPluginUtils
         }
 
         // Specific ApacheDS folder
-        IPath apacheDsFolderPath = librariesFolderPath.append( APACHEDS + "-" + server.getVersion() );
+        IPath apacheDsFolderPath = librariesFolderPath.append( APACHEDS + "-" + server.getVersion() ); //$NON-NLS-1$
         File apacheDsFolder = new File( apacheDsFolderPath.toOSString() );
         if ( !apacheDsFolder.exists() )
         {
@@ -100,7 +100,7 @@ public class ApacheDsPluginUtils
                 }
                 catch ( IOException e )
                 {
-                    ApacheDsPluginUtils.reportError( "An error occurred when copying the library '"
+                    ApacheDsPluginUtils.reportError( "An error occurred when copying the library '" //$NON-NLS-1$
                         + apachedsLibraryFilename + "' to the location '" + apachedsLibrary.getAbsolutePath()
                         + "'.\n\n" + e.getMessage() );
                 }
@@ -127,104 +127,104 @@ public class ApacheDsPluginUtils
             {
                 case VERSION_1_5_6:
                     return new String[]
-                        { "antlr-2.7.7.jar", "apacheds-avl-partition-1.5.6.jar", "apacheds-core-1.5.6.jar",
-                            "apacheds-core-annotations-1.5.6.jar", "apacheds-core-api-1.5.6.jar",
-                            "apacheds-core-avl-1.5.6.jar", "apacheds-core-constants-1.5.6.jar",
-                            "apacheds-core-entry-1.5.6.jar", "apacheds-core-jndi-1.5.6.jar",
-                            "apacheds-core-mock-1.5.6.jar", "apacheds-http-integration-1.5.6.jar",
-                            "apacheds-i18n-1.5.6.jar", "apacheds-interceptor-kerberos-1.5.6.jar",
-                            "apacheds-jdbm-1.5.6.jar", "apacheds-jdbm-partition-1.5.6.jar",
-                            "apacheds-jdbm-store-1.5.6.jar", "apacheds-kerberos-shared-1.5.6.jar",
-                            "apacheds-launcher-1.5.0.jar", "apacheds-ldif-partition-1.5.6.jar",
-                            "apacheds-protocol-changepw-1.5.6.jar", "apacheds-protocol-dns-1.5.6.jar",
-                            "apacheds-protocol-kerberos-1.5.6.jar", "apacheds-protocol-ldap-1.5.6.jar",
-                            "apacheds-protocol-ntp-1.5.6.jar", "apacheds-protocol-shared-1.5.6.jar",
-                            "apacheds-server-jndi-1.5.6.jar", "apacheds-server-xml-1.5.6.jar",
-                            "apacheds-utils-1.5.6.jar", "apacheds-xbean-spring-1.5.6.jar",
-                            "apacheds-xdbm-base-1.5.6.jar", "apacheds-xdbm-search-1.5.6.jar",
-                            "apacheds-xdbm-tools-1.5.6.jar", "bcprov-jdk15-140.jar", "commons-cli-1.2.jar",
-                            "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", "commons-io-1.4.jar",
-                            "commons-lang-2.5.jar", "daemon-bootstrappers-1.1.7.jar", "dom4j-1.6.1.jar",
-                            "jcl-over-slf4j-1.5.10.jar", "jetty-6.1.14.jar", "jetty-util-6.1.14.jar", "junit-4.7.jar",
-                            "log4j-1.2.14.jar", "mina-core-2.0.0-RC1.jar", "servlet-api-2.5-6.1.14.jar",
-                            "shared-asn1-0.9.18.jar", "shared-asn1-codec-0.9.18.jar", "shared-cursor-0.9.18.jar",
-                            "shared-dsml-parser-0.9.18.jar", "shared-i18n-0.9.18.jar", "shared-ldap-0.9.18.jar",
-                            "shared-ldap-constants-0.9.18.jar", "shared-ldap-converter-0.9.18.jar",
-                            "shared-ldap-jndi-0.9.18.jar", "shared-ldap-schema-0.9.18.jar",
-                            "shared-ldap-schema-dao-0.9.18.jar", "shared-ldap-schema-loader-0.9.18.jar",
-                            "shared-ldap-schema-manager-0.9.18.jar", "shared-ldif-0.9.18.jar", "slf4j-api-1.5.10.jar",
-                            "slf4j-log4j12-1.5.10.jar", "spring-beans-2.5.6.SEC01.jar",
-                            "spring-context-2.5.6.SEC01.jar", "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar",
-                            "xercesImpl-2.9.1.jar", "xpp3-1.1.4c.jar" };
+                        { "antlr-2.7.7.jar", "apacheds-avl-partition-1.5.6.jar", "apacheds-core-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "apacheds-core-annotations-1.5.6.jar", "apacheds-core-api-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-core-avl-1.5.6.jar", "apacheds-core-constants-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-core-entry-1.5.6.jar", "apacheds-core-jndi-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-core-mock-1.5.6.jar", "apacheds-http-integration-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-i18n-1.5.6.jar", "apacheds-interceptor-kerberos-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-jdbm-1.5.6.jar", "apacheds-jdbm-partition-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-jdbm-store-1.5.6.jar", "apacheds-kerberos-shared-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-launcher-1.5.0.jar", "apacheds-ldif-partition-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-protocol-changepw-1.5.6.jar", "apacheds-protocol-dns-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-protocol-kerberos-1.5.6.jar", "apacheds-protocol-ldap-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-protocol-ntp-1.5.6.jar", "apacheds-protocol-shared-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-server-jndi-1.5.6.jar", "apacheds-server-xml-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-utils-1.5.6.jar", "apacheds-xbean-spring-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-xdbm-base-1.5.6.jar", "apacheds-xdbm-search-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-xdbm-tools-1.5.6.jar", "bcprov-jdk15-140.jar", "commons-cli-1.2.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", "commons-io-1.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "commons-lang-2.5.jar", "daemon-bootstrappers-1.1.7.jar", "dom4j-1.6.1.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "jcl-over-slf4j-1.5.10.jar", "jetty-6.1.14.jar", "jetty-util-6.1.14.jar", "junit-4.7.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+                            "log4j-1.2.14.jar", "mina-core-2.0.0-RC1.jar", "servlet-api-2.5-6.1.14.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "shared-asn1-0.9.18.jar", "shared-asn1-codec-0.9.18.jar", "shared-cursor-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "shared-dsml-parser-0.9.18.jar", "shared-i18n-0.9.18.jar", "shared-ldap-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "shared-ldap-constants-0.9.18.jar", "shared-ldap-converter-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "shared-ldap-jndi-0.9.18.jar", "shared-ldap-schema-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "shared-ldap-schema-dao-0.9.18.jar", "shared-ldap-schema-loader-0.9.18.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "shared-ldap-schema-manager-0.9.18.jar", "shared-ldif-0.9.18.jar", "slf4j-api-1.5.10.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "slf4j-log4j12-1.5.10.jar", "spring-beans-2.5.6.SEC01.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "spring-context-2.5.6.SEC01.jar", "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "xercesImpl-2.9.1.jar", "xpp3-1.1.4c.jar" }; //$NON-NLS-1$ //$NON-NLS-2$
                 case VERSION_1_5_5:
                     return new String[]
-                        { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.5.jar",
-                            "apacheds-bootstrap-partition-1.5.5.jar", "apacheds-core-1.5.5.jar",
-                            "apacheds-core-avl-1.5.5.jar", "apacheds-core-constants-1.5.5.jar",
-                            "apacheds-core-entry-1.5.5.jar", "apacheds-core-jndi-1.5.5.jar",
-                            "apacheds-core-shared-1.5.5.jar", "apacheds-interceptor-kerberos-1.5.5.jar",
-                            "apacheds-jdbm-1.5.5.jar", "apacheds-jdbm-store-1.5.5.jar",
-                            "apacheds-kerberos-shared-1.5.5.jar", "apacheds-launcher-1.5.0.jar",
-                            "apacheds-protocol-changepw-1.5.5.jar", "apacheds-protocol-dns-1.5.5.jar",
-                            "apacheds-protocol-kerberos-1.5.5.jar", "apacheds-protocol-ldap-1.5.5.jar",
-                            "apacheds-protocol-ntp-1.5.5.jar", "apacheds-protocol-shared-1.5.5.jar",
-                            "apacheds-schema-bootstrap-1.5.5.jar", "apacheds-schema-extras-1.5.5.jar",
-                            "apacheds-schema-registries-1.5.5.jar", "apacheds-server-jndi-1.5.5.jar",
-                            "apacheds-server-xml-1.5.5.jar", "apacheds-utils-1.5.5.jar",
-                            "apacheds-xbean-spring-1.5.5.jar", "apacheds-xdbm-base-1.5.5.jar",
-                            "apacheds-xdbm-search-1.5.5.jar", "apacheds-xdbm-tools-1.5.5.jar", "bcprov-jdk15-140.jar",
-                            "commons-cli-1.2.jar", "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar",
-                            "commons-io-1.4.jar", "commons-lang-2.4.jar", "daemon-bootstrappers-1.1.6.jar",
-                            "jcl-over-slf4j-1.5.6.jar", "log4j-1.2.14.jar", "mina-core-2.0.0-M6.jar",
-                            "shared-asn1-0.9.15.jar", "shared-asn1-codec-0.9.15.jar", "shared-cursor-0.9.15.jar",
-                            "shared-ldap-0.9.15.jar", "shared-ldap-constants-0.9.15.jar", "slf4j-api-1.5.6.jar",
-                            "slf4j-log4j12-1.5.6.jar", "spring-beans-2.5.6.SEC01.jar",
-                            "spring-context-2.5.6.SEC01.jar", "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar" };
+                        { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-bootstrap-partition-1.5.5.jar", "apacheds-core-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-core-avl-1.5.5.jar", "apacheds-core-constants-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-core-entry-1.5.5.jar", "apacheds-core-jndi-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-core-shared-1.5.5.jar", "apacheds-interceptor-kerberos-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-jdbm-1.5.5.jar", "apacheds-jdbm-store-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-kerberos-shared-1.5.5.jar", "apacheds-launcher-1.5.0.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-protocol-changepw-1.5.5.jar", "apacheds-protocol-dns-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-protocol-kerberos-1.5.5.jar", "apacheds-protocol-ldap-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-protocol-ntp-1.5.5.jar", "apacheds-protocol-shared-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-schema-bootstrap-1.5.5.jar", "apacheds-schema-extras-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-schema-registries-1.5.5.jar", "apacheds-server-jndi-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-server-xml-1.5.5.jar", "apacheds-utils-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-xbean-spring-1.5.5.jar", "apacheds-xdbm-base-1.5.5.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-xdbm-search-1.5.5.jar", "apacheds-xdbm-tools-1.5.5.jar", "bcprov-jdk15-140.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "commons-cli-1.2.jar", "commons-collections-3.2.1.jar", "commons-daemon-1.0.1.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "commons-io-1.4.jar", "commons-lang-2.4.jar", "daemon-bootstrappers-1.1.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "jcl-over-slf4j-1.5.6.jar", "log4j-1.2.14.jar", "mina-core-2.0.0-M6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "shared-asn1-0.9.15.jar", "shared-asn1-codec-0.9.15.jar", "shared-cursor-0.9.15.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "shared-ldap-0.9.15.jar", "shared-ldap-constants-0.9.15.jar", "slf4j-api-1.5.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "slf4j-log4j12-1.5.6.jar", "spring-beans-2.5.6.SEC01.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "spring-context-2.5.6.SEC01.jar", "spring-core-2.5.6.SEC01.jar", "xbean-spring-3.5.jar" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 case VERSION_1_5_4:
                     return new String[]
-                        { "antlr-2.7.7.jar", "xbean-spring-3.3.jar", "apacheds-bootstrap-extract-1.5.4.jar",
-                            "apacheds-bootstrap-partition-1.5.4.jar", "apacheds-core-1.5.4.jar",
-                            "apacheds-core-avl-1.5.4.jar", "apacheds-core-constants-1.5.4.jar",
-                            "apacheds-core-cursor-1.5.4.jar", "apacheds-core-entry-1.5.4.jar",
-                            "apacheds-core-shared-1.5.4.jar", "apacheds-jdbm-1.5.4.jar",
-                            "apacheds-jdbm-store-1.5.4.jar", "apacheds-kerberos-shared-1.5.4.jar",
-                            "apacheds-launcher-1.2.0.jar", "apacheds-protocol-changepw-1.5.4.jar",
-                            "apacheds-protocol-dns-1.5.4.jar", "apacheds-protocol-kerberos-1.5.4.jar",
-                            "apacheds-protocol-ldap-1.5.4.jar", "apacheds-protocol-ntp-1.5.4.jar",
-                            "apacheds-protocol-shared-1.5.4.jar", "apacheds-schema-bootstrap-1.5.4.jar",
-                            "apacheds-schema-extras-1.5.4.jar", "apacheds-schema-registries-1.5.4.jar",
-                            "apacheds-server-jndi-1.5.4.jar", "apacheds-server-xml-1.5.4.jar",
-                            "apacheds-utils-1.5.4.jar", "apacheds-xbean-spring-1.5.4.jar",
-                            "apacheds-xdbm-base-1.5.4.jar", "apacheds-xdbm-search-1.5.4.jar",
-                            "apacheds-xdbm-tools-1.5.4.jar", "commons-cli-1.1.jar", "commons-collections-3.2.jar",
-                            "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar", "daemon-bootstrappers-1.1.4.jar",
-                            "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar",
-                            "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.12.jar", "shared-asn1-codec-0.9.12.jar",
-                            "shared-bouncycastle-reduced-0.9.12.jar", "shared-ldap-0.9.12.jar",
-                            "shared-ldap-constants-0.9.12.jar", "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar",
-                            "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", "spring-core-2.0.6.jar" };
+                        { "antlr-2.7.7.jar", "xbean-spring-3.3.jar", "apacheds-bootstrap-extract-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "apacheds-bootstrap-partition-1.5.4.jar", "apacheds-core-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-core-avl-1.5.4.jar", "apacheds-core-constants-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-core-cursor-1.5.4.jar", "apacheds-core-entry-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-core-shared-1.5.4.jar", "apacheds-jdbm-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-jdbm-store-1.5.4.jar", "apacheds-kerberos-shared-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-launcher-1.2.0.jar", "apacheds-protocol-changepw-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-protocol-dns-1.5.4.jar", "apacheds-protocol-kerberos-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-protocol-ldap-1.5.4.jar", "apacheds-protocol-ntp-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-protocol-shared-1.5.4.jar", "apacheds-schema-bootstrap-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-schema-extras-1.5.4.jar", "apacheds-schema-registries-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-server-jndi-1.5.4.jar", "apacheds-server-xml-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-utils-1.5.4.jar", "apacheds-xbean-spring-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-xdbm-base-1.5.4.jar", "apacheds-xdbm-search-1.5.4.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-xdbm-tools-1.5.4.jar", "commons-cli-1.1.jar", "commons-collections-3.2.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar", "daemon-bootstrappers-1.1.4.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.12.jar", "shared-asn1-codec-0.9.12.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "shared-bouncycastle-reduced-0.9.12.jar", "shared-ldap-0.9.12.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "shared-ldap-constants-0.9.12.jar", "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", "spring-core-2.0.6.jar" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
                 case VERSION_1_5_3:
                     return new String[]
-                        { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.3.jar",
-                            "apacheds-bootstrap-partition-1.5.3.jar", "apacheds-btree-base-1.5.3.jar",
-                            "apacheds-core-1.5.3.jar", "apacheds-core-constants-1.5.3.jar",
-                            "apacheds-core-entry-1.5.3.jar", "apacheds-core-shared-1.5.3.jar",
-                            "apacheds-jdbm-1.5.3.jar", "apacheds-jdbm-store-1.5.3.jar",
-                            "apacheds-kerberos-shared-1.5.3.jar", "apacheds-launcher-1.2.0.jar",
-                            "apacheds-protocol-changepw-1.5.3.jar", "apacheds-protocol-dns-1.5.3.jar",
-                            "apacheds-protocol-kerberos-1.5.3.jar", "apacheds-protocol-ldap-1.5.3.jar",
-                            "apacheds-protocol-ntp-1.5.3.jar", "apacheds-protocol-shared-1.5.3.jar",
-                            "apacheds-schema-bootstrap-1.5.3.jar", "apacheds-schema-extras-1.5.3.jar",
-                            "apacheds-schema-registries-1.5.3.jar", "apacheds-server-jndi-1.5.3.jar",
-                            "apacheds-server-xml-1.5.3.jar", "apacheds-utils-1.5.3.jar",
-                            "apacheds-xbean-spring-1.5.3.jar", "commons-cli-1.1.jar", "commons-collections-3.2.jar",
-                            "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar", "daemon-bootstrappers-1.1.3.jar",
-                            "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar",
-                            "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.11.jar", "shared-asn1-codec-0.9.11.jar",
-                            "shared-bouncycastle-reduced-0.9.11.jar", "shared-ldap-0.9.11.jar",
-                            "shared-ldap-constants-0.9.11.jar", "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar",
-                            "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", "spring-core-2.0.6.jar",
-                            "xbean-spring-3.3.jar" };
+                        { "antlr-2.7.7.jar", "apacheds-bootstrap-extract-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-bootstrap-partition-1.5.3.jar", "apacheds-btree-base-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-core-1.5.3.jar", "apacheds-core-constants-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-core-entry-1.5.3.jar", "apacheds-core-shared-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-jdbm-1.5.3.jar", "apacheds-jdbm-store-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-kerberos-shared-1.5.3.jar", "apacheds-launcher-1.2.0.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-protocol-changepw-1.5.3.jar", "apacheds-protocol-dns-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-protocol-kerberos-1.5.3.jar", "apacheds-protocol-ldap-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-protocol-ntp-1.5.3.jar", "apacheds-protocol-shared-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-schema-bootstrap-1.5.3.jar", "apacheds-schema-extras-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-schema-registries-1.5.3.jar", "apacheds-server-jndi-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-server-xml-1.5.3.jar", "apacheds-utils-1.5.3.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "apacheds-xbean-spring-1.5.3.jar", "commons-cli-1.1.jar", "commons-collections-3.2.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "commons-daemon-1.0.1.jar", "commons-lang-2.3.jar", "daemon-bootstrappers-1.1.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "jcl104-over-slf4j-1.4.3.jar", "log4j-1.2.14.jar", "mina-core-1.1.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "mina-filter-ssl-1.1.6.jar", "shared-asn1-0.9.11.jar", "shared-asn1-codec-0.9.11.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "shared-bouncycastle-reduced-0.9.11.jar", "shared-ldap-0.9.11.jar", //$NON-NLS-1$ //$NON-NLS-2$
+                            "shared-ldap-constants-0.9.11.jar", "slf4j-api-1.4.3.jar", "slf4j-log4j12-1.4.3.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "spring-beans-2.0.6.jar", "spring-context-2.0.6.jar", "spring-core-2.0.6.jar", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+                            "xbean-spring-3.3.jar" }; //$NON-NLS-1$
             };
         }
 
@@ -248,7 +248,7 @@ public class ApacheDsPluginUtils
     {
         // Getting he URL of the library within the bundle
         URL libraryUrl = FileLocator.find( ApacheDsPlugin.getDefault().getBundle(), new Path( RESOURCES
-            + IPath.SEPARATOR + LIBS + IPath.SEPARATOR + APACHEDS + "-" + server.getVersion().toString()
+            + IPath.SEPARATOR + LIBS + IPath.SEPARATOR + APACHEDS + "-" + server.getVersion().toString() //$NON-NLS-1$
             + IPath.SEPARATOR + library ), null );
 
         // Creating the input and output streams
@@ -296,7 +296,7 @@ public class ApacheDsPluginUtils
     public static IPath getApacheDsLibrariesFolder( Server server )
     {
         return ApacheDsPlugin.getDefault().getStateLocation().append( LIBRARIES_FOLDER_NAME ).append(
-            APACHEDS + "-" + server.getVersion() );
+            APACHEDS + "-" + server.getVersion() ); //$NON-NLS-1$
     }
 
 
@@ -329,28 +329,28 @@ public class ApacheDsPluginUtils
         serverFolder.mkdir();
 
         // Creating the server sub folders
-        File confFolder = new File( serverFolder, "conf" );
+        File confFolder = new File( serverFolder, "conf" ); //$NON-NLS-1$
         confFolder.mkdir();
-        File serverSocketFolder = new File( serverFolder, "serverSocket" );
+        File serverSocketFolder = new File( serverFolder, "serverSocket" ); //$NON-NLS-1$
         serverSocketFolder.mkdir();
-        new File( serverFolder, "ldif" ).mkdir();
-        new File( serverFolder, "log" ).mkdir();
-        new File( serverFolder, "partitions" ).mkdir();
+        new File( serverFolder, "ldif" ).mkdir(); //$NON-NLS-1$
+        new File( serverFolder, "log" ).mkdir(); //$NON-NLS-1$
+        new File( serverFolder, "partitions" ).mkdir(); //$NON-NLS-1$
 
         // Copying default configuration files
         try
         {
             // Creating log4j.properties file
-            File log4jPropertiesFile = new File( confFolder, "log4j.properties" );
+            File log4jPropertiesFile = new File( confFolder, "log4j.properties" ); //$NON-NLS-1$
             createServersLog4jPropertiesFile( new FileOutputStream( log4jPropertiesFile ), 1024, getServerLogsLevel(), // Setting 1024 as default port
                 getServerLogsPattern() );
 
             // Copying server.xml file
-            File serverXmlFile = new File( confFolder, "server.xml" );
-            copyConfigurationFile( "server-1.5.6.xml", serverXmlFile );
+            File serverXmlFile = new File( confFolder, "server.xml" ); //$NON-NLS-1$
+            copyConfigurationFile( "server-1.5.6.xml", serverXmlFile ); //$NON-NLS-1$
 
             // Creating log4j.properties file to the serverSocket folder
-            File log4jPropertiesServerSocketFile = new File( serverSocketFolder, "log4j.properties" );
+            File log4jPropertiesServerSocketFile = new File( serverSocketFolder, "log4j.properties" ); //$NON-NLS-1$
             createServerSocketLog4jPropertiesFile( new FileOutputStream( log4jPropertiesServerSocketFile ), id );
         }
         catch ( IOException e )
@@ -381,43 +381,43 @@ public class ApacheDsPluginUtils
     {
         // Creating the file content in a StringBuffer
         StringBuffer sb = new StringBuffer();
-        sb.append( "#############################################################################" ).append( "\n" );
-        sb.append( "#    Licensed to the Apache Software Foundation (ASF) under one or more" ).append( "\n" );
-        sb.append( "#    contributor license agreements.  See the NOTICE file distributed with" ).append( "\n" );
-        sb.append( "#    this work for additional information regarding copyright ownership." ).append( "\n" );
-        sb.append( "#    The ASF licenses this file to You under the Apache License, Version 2.0" ).append( "\n" );
-        sb.append( "#    (the \"License\"); you may not use this file except in compliance with" ).append( "\n" );
-        sb.append( "#    the License.  You may obtain a copy of the License at" ).append( "\n" );
-        sb.append( "#" ).append( "\n" );
-        sb.append( "#       http://www.apache.org/licenses/LICENSE-2.0" ).append( "\n" );
-        sb.append( "#" ).append( "\n" );
-        sb.append( "#    Unless required by applicable law or agreed to in writing, software" ).append( "\n" );
-        sb.append( "#    distributed under the License is distributed on an \"AS IS\" BASIS," ).append( "\n" );
-        sb.append( "#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied." ).append( "\n" );
-        sb.append( "#    See the License for the specific language governing permissions and" ).append( "\n" );
-        sb.append( "#    limitations under the License." ).append( "\n" );
-        sb.append( "#############################################################################" ).append( "\n" );
-        sb.append( "log4j.rootCategory=" + logsLevel + ", socketAppender, rollingFileAppender" ).append( "\n" );
-        sb.append( "" ).append( "\n" );
-        sb.append( "# The Socket Appender (used to send the logs to Apache Directory Studio)" ).append( "\n" );
-        sb.append( "log4j.appender.socketAppender=org.apache.log4j.net.SocketAppender" ).append( "\n" );
-        sb.append( "log4j.appender.socketAppender.RemoteHost=localhost" ).append( "\n" );
-        sb.append( "log4j.appender.socketAppender.Port=" ).append( port ).append( "\n" );
-        sb.append( "" ).append( "\n" );
-        sb.append( "# The Rolling File Appender" ).append( "\n" );
-        sb.append( "log4j.appender.rollingFileAppender=org.apache.log4j.RollingFileAppender" ).append( "\n" );
-        sb.append( "log4j.appender.rollingFileAppender.File=${apacheds.log.dir}/apacheds-rolling.log" ).append( "\n" );
-        sb.append( "log4j.appender.rollingFileAppender.MaxFileSize=1024KB" ).append( "\n" );
-        sb.append( "log4j.appender.rollingFileAppender.MaxBackupIndex=5" ).append( "\n" );
-        sb.append( "log4j.appender.rollingFileAppender.layout=org.apache.log4j.PatternLayout" ).append( "\n" );
-        sb.append( "log4j.appender.rollingFileAppender.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n" )
-            .append( "\n" );
-        sb.append( "" ).append( "\n" );
-        sb.append( "# with these we'll not get innundated when switching to DEBUG" ).append( "\n" );
-        sb.append( "log4j.logger.org.apache.directory.shared.ldap.name=WARN" ).append( "\n" );
-        sb.append( "log4j.logger.org.springframework=WARN" ).append( "\n" );
-        sb.append( "log4j.logger.org.apache.directory.shared.codec=WARN" ).append( "\n" );
-        sb.append( "log4j.logger.org.apache.directory.shared.asn1=WARN" ).append( "\n" );
+        sb.append( "#############################################################################" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    Licensed to the Apache Software Foundation (ASF) under one or more" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    contributor license agreements.  See the NOTICE file distributed with" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    this work for additional information regarding copyright ownership." ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    The ASF licenses this file to You under the Apache License, Version 2.0" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    (the \"License\"); you may not use this file except in compliance with" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    the License.  You may obtain a copy of the License at" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#       http://www.apache.org/licenses/LICENSE-2.0" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    Unless required by applicable law or agreed to in writing, software" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    distributed under the License is distributed on an \"AS IS\" BASIS," ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied." ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    See the License for the specific language governing permissions and" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    limitations under the License." ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#############################################################################" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.rootCategory=" + logsLevel + ", socketAppender, rollingFileAppender" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        sb.append( "" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "# The Socket Appender (used to send the logs to Apache Directory Studio)" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.appender.socketAppender=org.apache.log4j.net.SocketAppender" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.appender.socketAppender.RemoteHost=localhost" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.appender.socketAppender.Port=" ).append( port ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "# The Rolling File Appender" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.appender.rollingFileAppender=org.apache.log4j.RollingFileAppender" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.appender.rollingFileAppender.File=${apacheds.log.dir}/apacheds-rolling.log" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.appender.rollingFileAppender.MaxFileSize=1024KB" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.appender.rollingFileAppender.MaxBackupIndex=5" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.appender.rollingFileAppender.layout=org.apache.log4j.PatternLayout" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.appender.rollingFileAppender.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n" ) //$NON-NLS-1$
+            .append( "\n" ); //$NON-NLS-1$
+        sb.append( "" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "# with these we'll not get innundated when switching to DEBUG" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.logger.org.apache.directory.shared.ldap.name=WARN" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.logger.org.springframework=WARN" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.logger.org.apache.directory.shared.codec=WARN" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.logger.org.apache.directory.shared.asn1=WARN" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
 
         // Writing the content to the file
         os.write( sb.toString().getBytes() );
@@ -438,33 +438,33 @@ public class ApacheDsPluginUtils
     {
         // Creating the file content in a StringBuffer
         StringBuffer sb = new StringBuffer();
-        sb.append( "#############################################################################" ).append( "\n" );
-        sb.append( "#    Licensed to the Apache Software Foundation (ASF) under one or more" ).append( "\n" );
-        sb.append( "#    contributor license agreements.  See the NOTICE file distributed with" ).append( "\n" );
-        sb.append( "#    this work for additional information regarding copyright ownership." ).append( "\n" );
-        sb.append( "#    The ASF licenses this file to You under the Apache License, Version 2.0" ).append( "\n" );
-        sb.append( "#    (the \"License\"); you may not use this file except in compliance with" ).append( "\n" );
-        sb.append( "#    the License.  You may obtain a copy of the License at" ).append( "\n" );
-        sb.append( "#" ).append( "\n" );
-        sb.append( "#       http://www.apache.org/licenses/LICENSE-2.0" ).append( "\n" );
-        sb.append( "#" ).append( "\n" );
-        sb.append( "#    Unless required by applicable law or agreed to in writing, software" ).append( "\n" );
-        sb.append( "#    distributed under the License is distributed on an \"AS IS\" BASIS," ).append( "\n" );
-        sb.append( "#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied." ).append( "\n" );
-        sb.append( "#    See the License for the specific language governing permissions and" ).append( "\n" );
-        sb.append( "#    limitations under the License." ).append( "\n" );
-        sb.append( "#############################################################################" ).append( "\n" );
-        sb.append( "log4j.rootCategory=ALL, studioConsoleAppender" ).append( "\n" );
-        sb.append( "" ).append( "\n" );
-        sb.append( "# Studio Console Appender (identified with the server id)" ).append( "\n" );
-        sb.append( "log4j.appender.studioConsoleAppender=org.apache.directory.studio.apacheds.StudioConsoleAppender" )
-            .append( "\n" );
-        sb.append( "log4j.appender.studioConsoleAppender.ServerId=" ).append( id ).append( "\n" );
-        sb.append( "log4j.appender.studioConsoleAppender.layout=org.apache.log4j.PatternLayout" ).append( "\n" );
-        sb.append( "" ).append( "\n" );
-        sb.append( "# Hiding logs from log4j" ).append( "\n" );
-        sb.append( "log4j.logger.org.apache.log4j.net.SocketServer=OFF" ).append( "\n" );
-        sb.append( "log4j.logger.org.apache.log4j.net.SocketNode=OFF" ).append( "\n" );
+        sb.append( "#############################################################################" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    Licensed to the Apache Software Foundation (ASF) under one or more" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    contributor license agreements.  See the NOTICE file distributed with" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    this work for additional information regarding copyright ownership." ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    The ASF licenses this file to You under the Apache License, Version 2.0" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    (the \"License\"); you may not use this file except in compliance with" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    the License.  You may obtain a copy of the License at" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#       http://www.apache.org/licenses/LICENSE-2.0" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    Unless required by applicable law or agreed to in writing, software" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    distributed under the License is distributed on an \"AS IS\" BASIS," ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied." ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    See the License for the specific language governing permissions and" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#    limitations under the License." ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "#############################################################################" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.rootCategory=ALL, studioConsoleAppender" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "# Studio Console Appender (identified with the server id)" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.appender.studioConsoleAppender=org.apache.directory.studio.apacheds.StudioConsoleAppender" ) //$NON-NLS-1$
+            .append( "\n" ); //$NON-NLS-1$
+        sb.append( "log4j.appender.studioConsoleAppender.ServerId=" ).append( id ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.appender.studioConsoleAppender.layout=org.apache.log4j.PatternLayout" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "# Hiding logs from log4j" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.logger.org.apache.log4j.net.SocketServer=OFF" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
+        sb.append( "log4j.logger.org.apache.log4j.net.SocketNode=OFF" ).append( "\n" ); //$NON-NLS-1$ //$NON-NLS-2$
 
         // Writing the content to the file
         os.write( sb.toString().getBytes() );
@@ -485,7 +485,7 @@ public class ApacheDsPluginUtils
     {
         // Getting he URL of the file within the bundle
         URL inputFilenameUrl = FileLocator.find( ApacheDsPlugin.getDefault().getBundle(), new Path( RESOURCES
-            + IPath.SEPARATOR + "conf" + IPath.SEPARATOR + inputFilename ), null );
+            + IPath.SEPARATOR + "conf" + IPath.SEPARATOR + inputFilename ), null ); //$NON-NLS-1$
 
         // Creating the input and output streams
         InputStream inputStream = inputFilenameUrl.openStream();
@@ -526,26 +526,26 @@ public class ApacheDsPluginUtils
             ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL );
         if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_DEBUG.equalsIgnoreCase( level ) )
         {
-            return "DEBUG";
+            return "DEBUG"; //$NON-NLS-1$
         }
         else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_INFO.equalsIgnoreCase( level ) )
         {
-            return "INFO";
+            return "INFO"; //$NON-NLS-1$
         }
         else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_WARN.equalsIgnoreCase( level ) )
         {
-            return "WARN";
+            return "WARN"; //$NON-NLS-1$
         }
         else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_ERROR.equalsIgnoreCase( level ) )
         {
-            return "ERROR";
+            return "ERROR"; //$NON-NLS-1$
         }
         else if ( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_FATAL.equalsIgnoreCase( level ) )
         {
-            return "FATAL";
+            return "FATAL"; //$NON-NLS-1$
         }
 
-        return "";
+        return ""; //$NON-NLS-1$
     }
 
 
@@ -592,7 +592,7 @@ public class ApacheDsPluginUtils
     public static ServerConfiguration getServerConfiguration( Server server ) throws ServerXmlIOException, IOException
     {
         InputStream fis = new FileInputStream( new File( ApacheDsPluginUtils.getApacheDsServersFolder().append(
-            server.getId() ).append( "conf" ).append( "server.xml" ).toOSString() ) );
+            server.getId() ).append( "conf" ).append( "server.xml" ).toOSString() ) ); //$NON-NLS-1$ //$NON-NLS-2$
 
         // Parsing and returning the server configuration
         switch ( server.getVersion() )

Modified: directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ConsolesHandler.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ConsolesHandler.java?rev=1228064&r1=1228063&r2=1228064&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ConsolesHandler.java (original)
+++ directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/ConsolesHandler.java Fri Jan  6 10:34:47 2012
@@ -91,7 +91,7 @@ public class ConsolesHandler
         {
             Server server = ServersHandler.getDefault().getServerById( serverId );
 
-            LogMessageConsole logMessageConsole = new LogMessageConsole( "ApacheDS - " + server.getName() );
+            LogMessageConsole logMessageConsole = new LogMessageConsole( "ApacheDS - " + server.getName() ); //$NON-NLS-1$
 
             consolesMap.put( serverId, logMessageConsole );
 

Modified: directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/PreferenceInitializer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/PreferenceInitializer.java?rev=1228064&r1=1228063&r2=1228064&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/PreferenceInitializer.java (original)
+++ directory/studio/trunk/plugins/apacheds/src/main/java/org/apache/directory/studio/apacheds/PreferenceInitializer.java Fri Jan  6 10:34:47 2012
@@ -79,6 +79,6 @@ public class PreferenceInitializer exten
         // Server Logs
         store.setDefault( ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL,
             ApacheDsPluginConstants.PREFS_SERVER_LOGS_LEVEL_WARN );
-        store.setDefault( ApacheDsPluginConstants.PREFS_SERVER_LOGS_PATTERN, "[%d{HH:mm:ss}] %p [%c] - %m%n" );
+        store.setDefault( ApacheDsPluginConstants.PREFS_SERVER_LOGS_PATTERN, "[%d{HH:mm:ss}] %p [%c] - %m%n" ); //$NON-NLS-1$
     }
 }



Mime
View raw message