From 1bd1dffc1e5f3565b89df69658fae789be40412b Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 24 Mar 2014 10:33:46 +0000
Subject: [PATCH] Checkpoint OPENDJ-1343 Migrate dsconfig - Replaced org.opends.messages.DSConfigMessages.* by com.forgerock.opendj.dsconfig.DsconfigMessages.*; - Replaced org.opends.messages.ToolMessages.* by com.forgerock.opendj.cli.CliMessages.*;
---
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java | 7 +--
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ArgumentExceptionFactory.java | 4 -
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/GetPropSubCommandHandler.java | 4 -
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java | 4 -
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SubCommandHandlerFactory.java | 2 -
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java | 4 -
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java | 4 -
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java | 7 +--
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValuePrinter.java | 2
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java | 6 +--
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java | 6 +--
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java | 18 +++------
13 files changed, 21 insertions(+), 49 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ArgumentExceptionFactory.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ArgumentExceptionFactory.java
index 7aa41d6..d12801f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ArgumentExceptionFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ArgumentExceptionFactory.java
@@ -26,9 +26,7 @@
*/
package org.opends.server.tools.dsconfig;
-
-
-import static org.opends.messages.DSConfigMessages.*;
+import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.AbstractManagedObjectDefinition;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
index 666dea0..f39d1b7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
@@ -28,12 +28,9 @@
+import static com.forgerock.opendj.cli.CliMessages.*;
import static com.forgerock.opendj.cli.ArgumentConstants.LIST_TABLE_SEPARATOR;
-import static org.opends.messages.DSConfigMessages.*;
-import static org.opends.messages.ToolMessages.INFO_NAME_PLACEHOLDER;
-import static org.opends.messages.ToolMessages.INFO_PROPERTY_PLACEHOLDER;
-import static org.opends.messages.ToolMessages.INFO_TYPE_PLACEHOLDER;
-import static org.opends.messages.ToolMessages.INFO_VALUE_SET_PLACEHOLDER;
+import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.
displayMissingMandatoryPropertyException;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
index 9a87e90..7584449 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
@@ -26,8 +26,6 @@
*/
package org.opends.server.tools.dsconfig;
-
-
import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.CliMessages.*;
import static com.forgerock.opendj.cli.Utils.SHELL_COMMENT_SEPARATOR;
@@ -37,11 +35,7 @@
import static com.forgerock.opendj.cli.Utils.getCurrentOperationDateMessage;
import static com.forgerock.opendj.util.StaticUtils.stackTraceToSingleLineString;
import static org.forgerock.util.Utils.closeSilently;
-import static org.opends.messages.DSConfigMessages.*;
-import static org.opends.messages.ToolMessages.ERR_DSCFG_ERROR_BATCH_FILE_AND_INTERACTIVE_INCOMPATIBLE;
-import static org.opends.messages.ToolMessages.ERR_DSCFG_ERROR_QUIET_AND_INTERACTIVE_INCOMPATIBLE;
-import static org.opends.messages.ToolMessages.INFO_CONFIGDS_TOOL_DESCRIPTION;
-import static org.opends.messages.ToolMessages.INFO_DESCRIPTION_CONFIG_OPTIONS_ARGS;
+import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.displayManagedObjectDecodingException;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.displayMissingMandatoryPropertyException;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.displayOperationRejectedException;
@@ -454,7 +448,7 @@
super(new PrintStream(out), new PrintStream(err));
this.parser = new SubCommandArgumentParser(getClass().getName(),
- INFO_CONFIGDS_TOOL_DESCRIPTION.get(), false);
+ INFO_DSCFG_TOOL_DESCRIPTION.get(), false);
this.factory = factory;
}
@@ -564,7 +558,7 @@
// Register the global arguments.
ArgumentGroup toolOptionsGroup = new ArgumentGroup(
- INFO_DESCRIPTION_CONFIG_OPTIONS_ARGS.get(), 2);
+ INFO_DSCFG_DESCRIPTION_OPTIONS_ARGS.get(), 2);
parser.addGlobalArgument(advancedModeArgument, toolOptionsGroup);
parser.addGlobalArgument(showUsageArgument);
@@ -706,9 +700,9 @@
if (batchFileArgument.isPresent() && !noPromptArgument.isPresent()) {
LocalizableMessage message =
- ERR_DSCFG_ERROR_BATCH_FILE_AND_INTERACTIVE_INCOMPATIBLE.get(
- batchFileArgument.getLongIdentifier(), noPromptArgument
- .getLongIdentifier());
+ ERR_DSCFG_ERROR_QUIET_AND_INTERACTIVE_INCOMPATIBLE.get(
+ batchFileArgument.getLongIdentifier(), noPromptArgument
+ .getLongIdentifier());
displayMessageAndUsageReference(message);
return 1;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java
index 0cb9f11..7d351bb 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java
@@ -26,9 +26,7 @@
*/
package org.opends.server.tools.dsconfig;
-
-
-import static org.opends.messages.DSConfigMessages.*;
+import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import java.util.List;
import java.util.SortedMap;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/GetPropSubCommandHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/GetPropSubCommandHandler.java
index 75fb03d..a7090b6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/GetPropSubCommandHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/GetPropSubCommandHandler.java
@@ -26,9 +26,7 @@
*/
package org.opends.server.tools.dsconfig;
-
-
-import static org.opends.messages.DSConfigMessages.*;
+import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import static com.forgerock.opendj.cli.ArgumentConstants.LIST_TABLE_SEPARATOR;
import java.io.PrintStream;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
index 0f908d4..1c51512 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/HelpSubCommandHandler.java
@@ -26,11 +26,8 @@
*/
package org.opends.server.tools.dsconfig;
-
-
-import static org.opends.messages.DSConfigMessages.*;
-import static org.opends.messages.UtilityMessages.*;
-import static org.opends.messages.ToolMessages.*;
+import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
+import static com.forgerock.opendj.cli.CliMessages.*;
import static com.forgerock.opendj.cli.Utils.MAX_LINE_WIDTH;
import java.io.PrintStream;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
index 3be2146..5ea8804 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java
@@ -30,7 +30,7 @@
import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_LONG_HELP;
import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_SHORT_HELP;
-import static org.opends.messages.DSConfigMessages.*;
+import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import static org.forgerock.util.Utils.closeSilently;
import java.security.GeneralSecurityException;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java
index 22c3f84..394240e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/ListSubCommandHandler.java
@@ -25,9 +25,7 @@
*/
package org.opends.server.tools.dsconfig;
-
-
-import static org.opends.messages.DSConfigMessages.*;
+import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import static com.forgerock.opendj.cli.ArgumentConstants.LIST_TABLE_SEPARATOR;
import java.io.PrintStream;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java
index f959a92..f2675bd 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java
@@ -26,9 +26,7 @@
*/
package org.opends.server.tools.dsconfig;
-
-
-import static org.opends.messages.DSConfigMessages.*;
+import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValuePrinter.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValuePrinter.java
index 359a86b..3de8035 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValuePrinter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValuePrinter.java
@@ -26,7 +26,7 @@
*/
package org.opends.server.tools.dsconfig;
-import static org.opends.messages.DSConfigMessages.*;
+import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
import java.text.NumberFormat;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
index 9eaa8d0..ba4e1e3 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
@@ -27,10 +27,8 @@
*/
package org.opends.server.tools.dsconfig;
-import static org.opends.messages.DSConfigMessages.*;
-import static org.opends.messages.ToolMessages.INFO_NAME_PLACEHOLDER;
-import static org.opends.messages.ToolMessages.INFO_PROPERTY_PLACEHOLDER;
-import static org.opends.messages.ToolMessages.INFO_VALUE_SET_PLACEHOLDER;
+import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
+import static com.forgerock.opendj.cli.CliMessages.*;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.
displayMissingMandatoryPropertyException;
import static org.opends.server.tools.dsconfig.ArgumentExceptionFactory.
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java
index d00a7c2..f1da683 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SubCommandHandler.java
@@ -28,10 +28,8 @@
-import static org.opends.messages.DSConfigMessages.*;
-import static org.opends.messages.ToolMessages.INFO_NAME_PLACEHOLDER;
-import static org.opends.messages.ToolMessages.INFO_PROPERTY_PLACEHOLDER;
-import static org.opends.messages.ToolMessages.INFO_UNIT_PLACEHOLDER;
+import static com.forgerock.opendj.dsconfig.DsconfigMessages.*;
+import static com.forgerock.opendj.cli.CliMessages.*;
import java.io.PrintStream;
import java.util.ArrayList;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SubCommandHandlerFactory.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SubCommandHandlerFactory.java
index 4887f16..690f3e0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SubCommandHandlerFactory.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/SubCommandHandlerFactory.java
@@ -26,8 +26,6 @@
*/
package org.opends.server.tools.dsconfig;
-
-
import java.util.SortedSet;
import java.util.TreeSet;
--
Gitblit v1.10.0