From c760c3566a0f8d34bde8e978b94d89b61f2cd349 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Tue, 24 Apr 2007 11:50:41 +0000
Subject: [PATCH] Fix for [Issue 1401] revoke support for '/' as option prefix
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java | 2 --
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java | 3 ---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java | 4 ----
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java | 3 ---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java | 3 ---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java | 3 ---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java | 3 ---
opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java | 4 ++--
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java | 3 ---
opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java | 4 ++--
10 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
index b51bb73..658533d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/ArgumentParser.java
@@ -734,14 +734,14 @@
}
}
}
- else if (arg.startsWith("-") || arg.startsWith("/"))
+ else if (arg.startsWith("-"))
{
// This indicates that we are using the 1-character name to reference
// the argument. It may be in any of the following forms:
// -n
// -nvalue
// -n value
- if (arg.equals("-") || arg.equals("/"))
+ if (arg.equals("-"))
{
int msgID = MSGID_ARGPARSER_INVALID_DASH_AS_ARGUMENT;
String message = getMessage(msgID);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java b/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
index 98417e8..158e46d 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/args/SubCommandArgumentParser.java
@@ -809,14 +809,14 @@
}
}
}
- else if (arg.startsWith("-") || arg.startsWith("/"))
+ else if (arg.startsWith("-"))
{
// This indicates that we are using the 1-character name to reference
// the argument. It may be in any of the following forms:
// -n
// -nvalue
// -n value
- if (arg.equals("-") || arg.equals("/"))
+ if (arg.equals("-"))
{
int msgID = MSGID_SUBCMDPARSER_INVALID_DASH_AS_ARGUMENT;
String message = getMessage(msgID);
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java
index 1d4f8e9..75c71a7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/EncodePasswordTestCase.java
@@ -768,9 +768,6 @@
args = new String[] { "-?" };
assertEquals(EncodePassword.encodePassword(args, false, null, null), 0);
-
- args = new String[] { "/?" };
- assertEquals(EncodePassword.encodePassword(args, false, null, null), 0);
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
index 1d430e8..20f67c1 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPCompareTestCase.java
@@ -1200,9 +1200,6 @@
args = new String[] { "-?" };
assertEquals(LDAPCompare.mainCompare(args, false, null, null), 0);
-
- args = new String[] { "/?" };
- assertEquals(LDAPCompare.mainCompare(args, false, null, null), 0);
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
index 6777a34..0e142a3 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPDeleteTestCase.java
@@ -965,8 +965,6 @@
args = new String[] { "-?" };
assertEquals(LDAPDelete.mainDelete(args, false, null, null), 0);
- args = new String[] { "/?" };
- assertEquals(LDAPDelete.mainDelete(args, false, null, null), 0);
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
index a9333b4..9ccb68d 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
@@ -1938,9 +1938,6 @@
args = new String[] { "-?" };
assertEquals(LDAPModify.mainModify(args, false, null, null), 0);
-
- args = new String[] { "/?" };
- assertEquals(LDAPModify.mainModify(args, false, null, null), 0);
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
index 334bdf1..9bc8f03 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPPasswordModifyTestCase.java
@@ -1112,10 +1112,6 @@
args = new String[] { "-?" };
assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
0);
-
- args = new String[] { "/?" };
- assertEquals(LDAPPasswordModify.mainPasswordModify(args, false, null, null),
- 0);
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
index 5e5a758..f623d11 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPSearchTestCase.java
@@ -1705,9 +1705,6 @@
args = new String[] { "-?" };
assertEquals(LDAPSearch.mainSearch(args, false, null, null), 0);
-
- args = new String[] { "/?" };
- assertEquals(LDAPSearch.mainSearch(args, false, null, null), 0);
}
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java
index c2faa10..88d0ffb 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDIFDiffTestCase.java
@@ -93,9 +93,6 @@
args = new String[] { "-?" };
assertEquals(LDIFDiff.mainDiff(args, true), 0);
-
- args = new String[] { "/?" };
- assertEquals(LDIFDiff.mainDiff(args, true), 0);
}
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java
index 11d460c..f2b3ab7 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/ListBackendsTestCase.java
@@ -395,9 +395,6 @@
args = new String[] { "-?" };
assertEquals(ListBackends.listBackends(args, false, null, null), 0);
-
- args = new String[] { "/?" };
- assertEquals(ListBackends.listBackends(args, false, null, null), 0);
}
}
--
Gitblit v1.10.0