From de89661cb139ada7d91c20890a837646a84e63d4 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 06 Feb 2014 16:27:59 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1303 - Renamed CommonArguments which are used here.
---
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java | 8 ++++----
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java | 8 ++++----
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java | 6 +++---
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java | 2 +-
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java | 4 ++--
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java | 4 ++--
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java | 4 ++--
opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java | 8 ++++----
8 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
index bfe2b17..055c01d 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
@@ -396,11 +396,11 @@
connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this);
runner = new BindPerformanceRunner(argParser, this);
- propertiesFileArgument = CommonArguments.getPropertiesFileArgument();
+ propertiesFileArgument = CommonArguments.getPropertiesFile();
argParser.addArgument(propertiesFileArgument);
argParser.setFilePropertiesArgument(propertiesFileArgument);
- noPropertiesFileArgument = CommonArguments.getNoPropertiesFileArgument();
+ noPropertiesFileArgument = CommonArguments.getNoPropertiesFile();
argParser.addArgument(noPropertiesFileArgument);
argParser.setNoPropertiesFileArgument(noPropertiesFileArgument);
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
index a00f1b0..418b2d3 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java
@@ -147,11 +147,11 @@
try {
connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this);
- propertiesFileArgument = CommonArguments.getPropertiesFileArgument();
+ propertiesFileArgument = CommonArguments.getPropertiesFile();
argParser.addArgument(propertiesFileArgument);
argParser.setFilePropertiesArgument(propertiesFileArgument);
- noPropertiesFileArgument = CommonArguments.getNoPropertiesFileArgument();
+ noPropertiesFileArgument = CommonArguments.getNoPropertiesFile();
argParser.addArgument(noPropertiesFileArgument);
argParser.setNoPropertiesFileArgument(noPropertiesFileArgument);
@@ -184,7 +184,7 @@
controlStr.setPropertyName("control");
argParser.addArgument(controlStr);
- version = CommonArguments.getVersionArgument();
+ version = CommonArguments.getVersion();
argParser.addArgument(version);
encodingStr =
@@ -194,7 +194,7 @@
encodingStr.setPropertyName("encoding");
argParser.addArgument(encodingStr);
- continueOnError = CommonArguments.getContinueOnErrorArgument();
+ continueOnError = CommonArguments.getContinueOnError();
argParser.addArgument(continueOnError);
noop =
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
index b6e68dd..bad6779 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java
@@ -267,11 +267,11 @@
try {
connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this);
- propertiesFileArgument = CommonArguments.getPropertiesFileArgument();
+ propertiesFileArgument = CommonArguments.getPropertiesFile();
argParser.addArgument(propertiesFileArgument);
argParser.setFilePropertiesArgument(propertiesFileArgument);
- noPropertiesFileArgument = CommonArguments.getNoPropertiesFileArgument();
+ noPropertiesFileArgument = CommonArguments.getNoPropertiesFile();
argParser.addArgument(noPropertiesFileArgument);
argParser.setNoPropertiesFileArgument(noPropertiesFileArgument);
@@ -323,7 +323,7 @@
controlStr.setPropertyName("control");
argParser.addArgument(controlStr);
- version = CommonArguments.getVersionArgument();
+ version = CommonArguments.getVersion();
argParser.addArgument(version);
encodingStr =
@@ -333,7 +333,7 @@
encodingStr.setPropertyName("encoding");
argParser.addArgument(encodingStr);
- continueOnError = CommonArguments.getContinueOnErrorArgument();
+ continueOnError = CommonArguments.getContinueOnError();
argParser.addArgument(continueOnError);
noop =
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
index b73f82b..fc27fdc 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java
@@ -113,11 +113,11 @@
try {
connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this);
- propertiesFileArgument = CommonArguments.getPropertiesFileArgument();
+ propertiesFileArgument = CommonArguments.getPropertiesFile();
argParser.addArgument(propertiesFileArgument);
argParser.setFilePropertiesArgument(propertiesFileArgument);
- noPropertiesFileArgument = CommonArguments.getNoPropertiesFileArgument();
+ noPropertiesFileArgument = CommonArguments.getNoPropertiesFile();
argParser.addArgument(noPropertiesFileArgument);
argParser.setNoPropertiesFileArgument(noPropertiesFileArgument);
@@ -163,7 +163,7 @@
controlStr.setPropertyName("control");
argParser.addArgument(controlStr);
- version = CommonArguments.getVersionArgument();
+ version = CommonArguments.getVersion();
argParser.addArgument(version);
verbose = CommonArguments.getVerbose();
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
index ec7a642..16ebe73 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
@@ -263,11 +263,11 @@
try {
connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this);
final StringArgument propertiesFileArgument =
- CommonArguments.getPropertiesFileArgument();
+ CommonArguments.getPropertiesFile();
argParser.addArgument(propertiesFileArgument);
argParser.setFilePropertiesArgument(propertiesFileArgument);
- final BooleanArgument noPropertiesFileArgument = CommonArguments.getNoPropertiesFileArgument();
+ final BooleanArgument noPropertiesFileArgument = CommonArguments.getNoPropertiesFile();
argParser.addArgument(noPropertiesFileArgument);
argParser.setNoPropertiesFileArgument(noPropertiesFileArgument);
@@ -365,7 +365,7 @@
effectiveRightsAttrs.setPropertyName(OPTION_LONG_EFFECTIVERIGHTSATTR);
argParser.addArgument(effectiveRightsAttrs);
- version = CommonArguments.getVersionArgument();
+ version = CommonArguments.getVersion();
argParser.addArgument(version);
final StringArgument encodingStr =
@@ -416,7 +416,7 @@
countEntries.setPropertyName("countEntries");
argParser.addArgument(countEntries);
- final BooleanArgument continueOnError = CommonArguments.getContinueOnErrorArgument();
+ final BooleanArgument continueOnError = CommonArguments.getContinueOnError();
argParser.addArgument(continueOnError);
noop =
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java
index 758ece9..164e5a2 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java
@@ -103,7 +103,7 @@
.get(INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get()));
argParser.addArgument(outputFilename);
- continueOnError = CommonArguments.getContinueOnErrorArgument();
+ continueOnError = CommonArguments.getContinueOnError();
argParser.addArgument(continueOnError);
showUsage = CommonArguments.getShowUsage();
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java
index cedb49e..48206ee 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java
@@ -175,11 +175,11 @@
connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this);
runner = new ModifyPerformanceRunner(argParser, this);
- propertiesFileArgument = CommonArguments.getPropertiesFileArgument();
+ propertiesFileArgument = CommonArguments.getPropertiesFile();
argParser.addArgument(propertiesFileArgument);
argParser.setFilePropertiesArgument(propertiesFileArgument);
- noPropertiesFileArgument = CommonArguments.getNoPropertiesFileArgument();
+ noPropertiesFileArgument = CommonArguments.getNoPropertiesFile();
argParser.addArgument(noPropertiesFileArgument);
argParser.setNoPropertiesFileArgument(noPropertiesFileArgument);
diff --git a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
index 32eb1b0..60d1a09 100644
--- a/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
+++ b/opendj-sdk/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
@@ -218,11 +218,11 @@
connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this);
runner = new SearchPerformanceRunner(argParser, this);
- propertiesFileArgument = CommonArguments.getPropertiesFileArgument();
+ propertiesFileArgument = CommonArguments.getPropertiesFile();
argParser.addArgument(propertiesFileArgument);
argParser.setFilePropertiesArgument(propertiesFileArgument);
- noPropertiesFileArgument = CommonArguments.getNoPropertiesFileArgument();
+ noPropertiesFileArgument = CommonArguments.getNoPropertiesFile();
argParser.addArgument(noPropertiesFileArgument);
argParser.setNoPropertiesFileArgument(noPropertiesFileArgument);
--
Gitblit v1.10.0