From b4b185fabd7d506d626bc9a4f9b99dd3dfa628c9 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 24 Mar 2014 10:14:38 +0000
Subject: [PATCH] Checkpoint OPENDJ-1343 Migrate dsconfig - Added dsconfig messages generation to pom file. - Removed duplicate message.

---
 opendj-sdk/opendj-config/pom.xml                                                              |    1 +
 opendj-sdk/opendj-config/src/main/resources/com/forgerock/opendj/dsconfig/dsconfig.properties |    8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/opendj-sdk/opendj-config/pom.xml b/opendj-sdk/opendj-config/pom.xml
index 6c830e0..3346502 100644
--- a/opendj-sdk/opendj-config/pom.xml
+++ b/opendj-sdk/opendj-config/pom.xml
@@ -100,6 +100,7 @@
                 <messageFile>com/forgerock/opendj/ldap/config.properties</messageFile>
                 <messageFile>com/forgerock/opendj/ldap/extension.properties</messageFile>
                 <messageFile>com/forgerock/opendj/ldap/protocol.properties</messageFile>
+                <messageFile>com/forgerock/opendj/dsconfig/dsconfig.properties</messageFile>
               </messageFiles>
             </configuration>
           </execution>
diff --git a/opendj-sdk/opendj-config/src/main/resources/com/forgerock/opendj/dsconfig/dsconfig.properties b/opendj-sdk/opendj-config/src/main/resources/com/forgerock/opendj/dsconfig/dsconfig.properties
index aea0def..385717c 100644
--- a/opendj-sdk/opendj-config/src/main/resources/com/forgerock/opendj/dsconfig/dsconfig.properties
+++ b/opendj-sdk/opendj-config/src/main/resources/com/forgerock/opendj/dsconfig/dsconfig.properties
@@ -429,12 +429,10 @@
 INFO_DSCFG_EQUIVALENT_COMMAND_LINE_SESSION_OPERATION_NUMBER_252=Session \
  operation number: %d
 INFO_DSCFG_DESCRIPTION_OPTIONS_ARGS_253=Configuration Options
-ERR_DSCFG_ERROR_BATCH_FILE_AND_INTERACTIVE_INCOMPATIBLE_254=If you specify \
+ERR_DSCFG_ERROR_QUIET_AND_INTERACTIVE_INCOMPATIBLE_254=If you specify \
  the {%s} argument you must also specify {%s}
-ERR_DSCFG_ERROR_QUIET_AND_INTERACTIVE_INCOMPATIBLE_255=If you specify \
- the {%s} argument you must also specify {%s}
-INFO_DSCFG_TOOL_DESCRIPTION_256=This utility can be used to define a base \
+INFO_DSCFG_TOOL_DESCRIPTION_255=This utility can be used to define a base \
  configuration for the Directory Server
-INFO_DSCFG_BATCH_FILE_PATH_257=Path to a batch file containing \
+INFO_DSCFG_BATCH_FILE_PATH_256=Path to a batch file containing \
 a set of dsconfig commands to be executed
 

--
Gitblit v1.10.0