From 6b654d23b0b1d0e5151941aece4658b5e6e8f50f Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 18 Nov 2008 18:09:45 +0000
Subject: [PATCH] Fix for issue 3620 (Control Panel: missing "--noPropertiesFile" in the equivalent command line)
---
opends/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java | 1 +
opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java | 11 +++++++++++
opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 4 ++++
opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteIndexTask.java | 1 +
opends/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java | 1 +
opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java | 1 +
opends/src/guitools/org/opends/guitools/controlpanel/task/RebuildIndexTask.java | 1 +
opends/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java | 1 +
opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java | 1 +
opends/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java | 1 +
opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java | 1 +
opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java | 2 ++
opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java | 1 +
opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java | 1 +
opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java | 2 ++
opends/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java | 2 ++
16 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
index f30cdc8..c6a7fa9 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java
@@ -769,6 +769,7 @@
getObfuscatedCommandLineArguments(
getCommandLineArgumentsToDisableReplication(domainName[0]));
args.removeAll(getConfigCommandLineArguments());
+ args.add(getNoPropertiesFileArgument());
for (String arg : args)
{
sb.append(" "+CommandBuilder.escapeValue(arg));
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
index c6a3436..db00ddd 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java
@@ -514,6 +514,7 @@
args.add(getCommandLinePath("ldapdelete"));
args.addAll(getObfuscatedCommandLineArguments(
getConnectionCommandLineArguments(useAdminCtx, true)));
+ args.add(getNoPropertiesFileArgument());
if (usingControl)
{
args.add("-J");
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteIndexTask.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
index 7d073a7..0756236 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteIndexTask.java
@@ -411,6 +411,7 @@
args.addAll(getConnectionCommandLineArguments());
args.add("--no-prompt");
+ args.add(getNoPropertiesFileArgument());
return args;
}
}
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
index d5490f6..2372992 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/DeleteSchemaElementsTask.java
@@ -445,6 +445,7 @@
args.add("-a");
args.addAll(getObfuscatedCommandLineArguments(
getConnectionCommandLineArguments(true, true)));
+ args.add(getNoPropertiesFileArgument());
StringBuilder sb = new StringBuilder();
for (String arg : args)
{
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java
index 32ca03f..0fb0385 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/NewEntryTask.java
@@ -292,6 +292,7 @@
args.add(getCommandLinePath("ldapmodify"));
args.addAll(getObfuscatedCommandLineArguments(
getConnectionCommandLineArguments(useAdminCtx, true)));
+ args.add(getNoPropertiesFileArgument());
args.add("--defaultAdd");
StringBuilder sb = new StringBuilder();
for (String arg : args)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/RebuildIndexTask.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/RebuildIndexTask.java
index 49338fb..b85b9b0 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/RebuildIndexTask.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/RebuildIndexTask.java
@@ -286,6 +286,7 @@
args.add("enabled:"+enable);
args.addAll(getConnectionCommandLineArguments());
+ args.add(getNoPropertiesFileArgument());
args.add("--no-prompt");
final StringBuilder sb = new StringBuilder();
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java
index 89b089c..9a03fec 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/SchemaTask.java
@@ -273,6 +273,8 @@
args.add("-a");
args.addAll(getObfuscatedCommandLineArguments(
getConnectionCommandLineArguments(true, true)));
+ args.add(getNoPropertiesFileArgument());
+
StringBuilder sb = new StringBuilder();
for (String arg : args)
{
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java
index ab8ccdf..cfc0420 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/Task.java
@@ -740,6 +740,15 @@
}
/**
+ * Returns the noPropertiesFile argument.
+ * @return the noPropertiesFile argument.
+ */
+ protected String getNoPropertiesFileArgument()
+ {
+ return "--noPropertiesFile";
+ }
+
+ /**
* Returns the command-line to be displayed (when we display the equivalent
* command-line).
* @return the command-line to be displayed.
@@ -822,6 +831,7 @@
args.add(getCommandLinePath("ldapmodify"));
args.addAll(getObfuscatedCommandLineArguments(
getConnectionCommandLineArguments(useAdminCtx, true)));
+ args.add(getNoPropertiesFileArgument());
StringBuilder sb = new StringBuilder();
for (String arg : args)
{
@@ -918,6 +928,7 @@
args.add(getCommandLinePath("ldapmodify"));
args.addAll(getObfuscatedCommandLineArguments(
getConnectionCommandLineArguments(useAdminCtx, true)));
+ args.add(getNoPropertiesFileArgument());
StringBuilder sb = new StringBuilder();
for (String arg : args)
{
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java
index 0aee3cd..b59839e 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupPanel.java
@@ -766,6 +766,8 @@
args.addAll(getConfigCommandLineArguments());
}
+ args.add(getNoPropertiesFileArgument());
+
return args;
}
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
index 382b2ca..263b5bd 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/ExportLDIFPanel.java
@@ -568,6 +568,7 @@
{
args.addAll(getConfigCommandLineArguments());
}
+ args.add(getNoPropertiesFileArgument());
return args;
}
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
index 30688df..19bf807 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/ImportLDIFPanel.java
@@ -694,6 +694,8 @@
args.addAll(getConfigCommandLineArguments());
}
+ args.add(getNoPropertiesFileArgument());
+
return args;
}
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
index f2f6d1e..5e6e02c 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -796,6 +796,8 @@
{
args.addAll(getConfigCommandLineArguments());
}
+
+ args.add(getNoPropertiesFileArgument());
}
return args;
}
@@ -1326,6 +1328,7 @@
}
}
args.addAll(getConnectionCommandLineArguments());
+ args.add(getNoPropertiesFileArgument());
args.add("--no-prompt");
dns.add(indexEntry.getDN().toString());
@@ -1498,6 +1501,7 @@
args.add("base-dn:"+newBaseDN);
}
args.addAll(getConnectionCommandLineArguments());
+ args.add(getNoPropertiesFileArgument());
args.add("--no-prompt");
}
return args;
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
index a3c82f7..fc46116 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewIndexPanel.java
@@ -770,6 +770,7 @@
args.add("--set");
args.add("index-entry-limit:"+entryLimitValue);
args.addAll(getConnectionCommandLineArguments());
+ args.add(getNoPropertiesFileArgument());
args.add("--no-prompt");
return args;
}
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
index ee93e09..ffb8cf1 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewVLVIndexPanel.java
@@ -515,6 +515,7 @@
args.add("sort-order:"+sortOrderStringValue);
args.addAll(getConnectionCommandLineArguments());
+ args.add(getNoPropertiesFileArgument());
args.add("--no-prompt");
return args;
}
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java
index 358d602..b4732cf 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/RestorePanel.java
@@ -450,6 +450,7 @@
{
args.addAll(getConfigCommandLineArguments());
}
+ args.add(getNoPropertiesFileArgument());
return args;
}
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
index f623fc0..4ffc47b 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/VLVIndexPanel.java
@@ -946,6 +946,7 @@
}
args.addAll(getConnectionCommandLineArguments());
+ args.add(getNoPropertiesFileArgument());
args.add("--no-prompt");
return args;
--
Gitblit v1.10.0