From f980cd69859da0da328e1d97306d70f2f0844ab8 Mon Sep 17 00:00:00 2001
From: jcambon <jcambon@localhost>
Date: Thu, 02 Apr 2009 16:11:20 +0000
Subject: [PATCH] Fix for issue #3748 : Some admin tools don't use 4444 as default admin port
---
opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java | 7 +++++--
opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java b/opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java
index 10cb1c0..3e52792 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/ManageAccount.java
@@ -23,7 +23,7 @@
*
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.tools;
import org.opends.messages.Message;
@@ -40,6 +40,7 @@
import javax.net.ssl.SSLException;
+import org.opends.server.admin.AdministrationConnector;
import org.opends.server.protocols.asn1.*;
import org.opends.server.protocols.ldap.ExtendedRequestProtocolOp;
import org.opends.server.protocols.ldap.ExtendedResponseProtocolOp;
@@ -868,7 +869,9 @@
port = new IntegerArgument(
"port", OPTION_SHORT_PORT,
OPTION_LONG_PORT, false, false, true,
- INFO_PORT_PLACEHOLDER.get(), 389, null, true, 1,
+ INFO_PORT_PLACEHOLDER.get(),
+ AdministrationConnector.DEFAULT_ADMINISTRATION_CONNECTOR_PORT,
+ null, true, 1,
true, 65535, INFO_PWPSTATE_DESCRIPTION_PORT.get());
argParser.addGlobalArgument(port);
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
index a4d61e2..863e1a8 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/StopDS.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.tools;
import org.opends.messages.Message;
@@ -41,6 +41,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import javax.net.ssl.SSLException;
+import org.opends.server.admin.AdministrationConnector;
import org.opends.server.controls.ProxiedAuthV2Control;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.LockFileManager;
@@ -255,7 +256,9 @@
port = new IntegerArgument(
"port", OPTION_SHORT_PORT,
OPTION_LONG_PORT, false, false, true,
- INFO_PORT_PLACEHOLDER.get(), 389, null, true, 1,
+ INFO_PORT_PLACEHOLDER.get(),
+ AdministrationConnector.DEFAULT_ADMINISTRATION_CONNECTOR_PORT,
+ null, true, 1,
true, 65535, INFO_STOPDS_DESCRIPTION_PORT.get());
port.setPropertyName(OPTION_LONG_PORT);
argParser.addArgument(port);
--
Gitblit v1.10.0