From 0f6ff58b0395c707009743a278bc5cb757ebb787 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 20 Oct 2011 16:06:11 +0000
Subject: [PATCH] Fix OpenDJ-222: Remove more references to OpenDS. Remove references in source code files.
---
opends/src/server/org/opends/server/util/StaticUtils.java | 2
opends/src/server/org/opends/server/util/VersionCompatibilityIssue.java | 5 +-
opends/src/server/org/opends/server/types/AbstractOperation.java | 2
opends/src/quicksetup/org/opends/quicksetup/Installation.java | 32 ++++++++--------
opends/src/server/org/opends/server/servicetag/ServiceTagRegistration.java | 7 ++-
opends/src/server/org/opends/server/core/SubentryPasswordPolicy.java | 4 +-
opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java | 2
opends/src/server/org/opends/server/util/SetupUtils.java | 5 +-
opends/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java | 2
opends/src/build-tools/org/opends/build/tools/GenerateMessageFile.java | 7 ++-
opends/src/server/org/opends/server/backends/TrustStoreBackend.java | 2
opends/src/build-tools/windows/README | 17 ++++----
opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java | 2
opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java | 23 ++++++-----
14 files changed, 59 insertions(+), 53 deletions(-)
diff --git a/opends/src/build-tools/org/opends/build/tools/GenerateMessageFile.java b/opends/src/build-tools/org/opends/build/tools/GenerateMessageFile.java
index 48b2def..25747ac 100644
--- a/opends/src/build-tools/org/opends/build/tools/GenerateMessageFile.java
+++ b/opends/src/build-tools/org/opends/build/tools/GenerateMessageFile.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.build.tools;
@@ -138,7 +139,7 @@
static {
KEY_FORM_MSG = new StringBuilder()
- .append(".\n\nOpenDS message property keys must be of the form\n\n")
+ .append(".\n\nOpenDJ message property keys must be of the form\n\n")
.append("\t\'[CATEGORY]_[SEVERITY]_[DESCRIPTION]_[ORDINAL]\'\n\n")
.append("where\n\n")
.append("CATEGORY is one of ")
@@ -205,7 +206,7 @@
}
/**
- * Indicates whether or not the specifier uses arguement
+ * Indicates whether or not the specifier uses argument
* indexes (for example 2$).
* @return boolean true if this specifier uses indexing
*/
@@ -216,7 +217,7 @@
/**
* Returns a java class associated with a particular formatter
* based on the conversion type of the specifier.
- * @return Class for representing the type of arguement used
+ * @return Class for representing the type of argument used
* as a replacement for this specifier.
*/
public Class<?> getSimpleConversionClass() {
diff --git a/opends/src/build-tools/windows/README b/opends/src/build-tools/windows/README
index 9812eb6..a70dd3d 100644
--- a/opends/src/build-tools/windows/README
+++ b/opends/src/build-tools/windows/README
@@ -23,8 +23,9 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
-
+
WHAT is winlauncher.exe
========================
winlauncher.exe is a small windows executable that is intended to be used by
@@ -34,10 +35,10 @@
See the comments in winlauncher.c file and common.c for more information.
- WHAT is opends_service.exe
+ WHAT is opendj_service.exe
========================
-opends_service.exe is a small windows executable that is intended to be used by
-the command line files to be able to run OpenDS as a windows service (or not
+opendj_service.exe is a small windows executable that is intended to be used by
+the command line files to be able to run OpenDJ as a windows service (or not
to configure it as windows service). It is not intended to be a final user
interface and that is one of the reasons why is placed under the lib
subdirectory.
@@ -100,12 +101,12 @@
This will generate the binary winlauncher.exe.
- INSTRUCTIONS TO COMPILE opends_service.exe and administrator_launcher.exe
+ INSTRUCTIONS TO COMPILE opendj_service.exe and administrator_launcher.exe
========================
-service.c (the main code file for opends_service.exe) uses windows resources and
+service.c (the main code file for opendj_service.exe) uses windows resources and
so it requires Windows libraries to be compiled.
-The fastest way of generating opends_service.exe is to do it using the command
+The fastest way of generating opendj_service.exe is to do it using the command
line.
Using Visual C++ and the command line you must set your environment
variables to point to your Visual Studio install. You can set the environment
@@ -117,6 +118,6 @@
> nmake all
-This command will generate both opends_service.exe and winlauncher.exe.
+This command will generate both opendj_service.exe and winlauncher.exe.
See the comments in the file Makefile for more information.
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
index da637f6..c22850d 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -1882,7 +1882,7 @@
{
if (rootDirectory == null)
{
- // This allows testing of configuration components when the OpenDS.jar
+ // This allows testing of configuration components when the OpenDJ.jar
// in the classpath does not necessarily point to the server's
String installRoot = System.getProperty("org.opends.quicksetup.Root");
diff --git a/opends/src/quicksetup/org/opends/quicksetup/Installation.java b/opends/src/quicksetup/org/opends/quicksetup/Installation.java
index de73476..6286974 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Installation.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Installation.java
@@ -44,7 +44,7 @@
import org.opends.server.util.SetupUtils;
/**
- * This class represents the physical state of an OpenDS installation.
+ * This class represents the physical state of an OpenDJ installation.
* All the operations are dependent upon the root directory that is
* specified in the constructor.
*/
@@ -382,12 +382,12 @@
/**
* Performs validation on the specified file to make sure that it is
- * an actual OpenDS installation.
+ * an actual OpenDJ installation.
* @param rootDirectory File directory candidate
* @throws IllegalArgumentException if root directory does not appear to
- * be an OpenDS installation root. The thrown exception contains
+ * be an OpenDJ installation root. The thrown exception contains
* a localized message indicating the reason why
- * <code>rootDirectory</code> is not a valid OpenDS install root.
+ * <code>rootDirectory</code> is not a valid OpenDJ install root.
*/
static public void validateRootDirectory(File rootDirectory)
throws IllegalArgumentException {
@@ -431,7 +431,7 @@
static public Installation getLocal() {
if (local == null) {
- // This allows testing of configuration components when the OpenDS.jar
+ // This allows testing of configuration components when the OpenDJ.jar
// in the classpath does not necessarily point to the server's
String installRoot = System.getProperty("org.opends.quicksetup.Root");
String instanceRoot = System
@@ -527,30 +527,30 @@
}
/**
- * Gets the top level directory of an OpenDS installation.
+ * Gets the top level directory of an OpenDJ installation.
*
* @return File object representing the top level directory of
- * and OpenDS installation
+ * and OpenDJ installation
*/
public File getRootDirectory() {
return this.rootDirectory;
}
/**
- * Gets the top level directory of an OpenDS instance.
+ * Gets the top level directory of an OpenDJ instance.
*
* @return File object representing the top level directory of
- * and OpenDS installation
+ * and OpenDK installation
*/
public File getInstanceDirectory() {
return this.instanceDirectory;
}
/**
- * Gets the directory of the OpenDS template instance.
+ * Gets the directory of the OpenDJ template instance.
*
* @return File object representing the top level directory of
- * and OpenDS installation
+ * and OpenDJ installation
*/
public File getTmplInstanceDirectory() {
File f = new File(getRootDirectory().getAbsolutePath() +
@@ -613,10 +613,10 @@
/**
* Indicates whether or not this installation appears to be an actual
- * OpenDS installation.
+ * OpenDJ installation.
* @param file The root directory
* @return boolean where true indicates that this does indeed appear to be
- * a valid OpenDS installation; false otherwise
+ * a valid OpenDJ installation; false otherwise
*/
public boolean isValid(File file) {
boolean valid = true;
@@ -629,10 +629,10 @@
}
/**
- * Creates a string explaining why this is not a legitimate OpenDS
+ * Creates a string explaining why this is not a legitimate OpenDJ
* installation. Null if this is in fact a vaild installation.
* @return localized message indicating the reason this is not an
- * OpenDS installation
+ * OpenDJ installation
*/
public String getInvalidityReason() {
String reason = null;
@@ -1056,7 +1056,7 @@
* @return the path to the opends jar file.
*/
public File getOpenDSJarFile() {
- return new File(getLibrariesDirectory(), "OpenDS.jar");
+ return new File(getLibrariesDirectory(), "OpenDJ.jar");
}
/**
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
index ac4a88c..8391dfd 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -2358,7 +2358,7 @@
InstallerHelper helper = new InstallerHelper();
helper.writeSetOpenDSJavaHome(getUserData(), getInstallationPath());
} catch (Exception e) {
- LOG.log(Level.WARNING, "Error writing OpenDS Java Home file: "+e, e);
+ LOG.log(Level.WARNING, "Error writing OpenDJ Java Home file: "+e, e);
}
}
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
index d4ae2d3..906b4d1 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.quicksetup.upgrader;
@@ -97,7 +98,7 @@
/**
* QuickSetup application of upgrading the bits of an installation of
- * OpenDS.
+ * OpenDJ.
*/
public class Upgrader extends GuiApplication implements CliApplication {
@@ -220,7 +221,7 @@
private BuildInformation stagedVersion = null;
/**
- * New OpenDS bits.
+ * New OpenDJ bits.
*/
private Installation stagedInstallation = null;
@@ -706,7 +707,7 @@
qs.displayFieldInvalid(FieldName.SERVER_TO_UPGRADE_LOCATION, false);
} catch (IllegalArgumentException iae) {
LOG.log(Level.INFO,
- "illegal OpenDS installation directory selected", iae);
+ "illegal OpenDJ installation directory selected", iae);
errorMsgs.add(INFO_ERROR_INVALID_SERVER_LOCATION.get(
serverLocationString));
qs.displayFieldInvalid(FieldName.SERVER_TO_UPGRADE_LOCATION, true);
@@ -1934,8 +1935,8 @@
}
/**
- * Returns the path of the new OpenDS bits.
- * @return the path of the new OpenDS bits.
+ * Returns the path of the new OpenDJ bits.
+ * @return the path of the new OpenDJ bits.
* @throws java.io.IOException if an error occurs while accessing the
* new bits
* @throws org.opends.quicksetup.ApplicationException if upgradability
@@ -2070,8 +2071,8 @@
}
/**
- * Returns the path of the new OpenDS bits.
- * @return the path of the new OpenDS bits.
+ * Returns the path of the new OpenDJ bits.
+ * @return the path of the new OpenDJ bits.
* @throws org.opends.quicksetup.ApplicationException
* if retrieval of stage files path fails
* @throws java.io.IOException if errors occurs while accessing stage files
@@ -2178,8 +2179,8 @@
}
/**
- * Returns the BuildInformation of the current OpenDS bits.
- * @return the BuildInformation of the current OpenDS bits.
+ * Returns the BuildInformation of the current OpenDJ bits.
+ * @return the BuildInformation of the current OpenDJ bits.
*/
private BuildInformation getCurrentBuildInformation() {
if (this.currentVersion == null) {
@@ -2193,8 +2194,8 @@
}
/**
- * Returns the BuildInformation of the OpenDS instance.
- * @return the BuildInformation of the OpenDS instance.
+ * Returns the BuildInformation of the OpenDJ instance.
+ * @return the BuildInformation of the OpenDJ instance.
*/
private BuildInformation getCurrentInstanceBuildInformation() {
if (this.currentInstanceVersion == null) {
diff --git a/opends/src/server/org/opends/server/backends/TrustStoreBackend.java b/opends/src/server/org/opends/server/backends/TrustStoreBackend.java
index 325c01e..0038325 100644
--- a/opends/src/server/org/opends/server/backends/TrustStoreBackend.java
+++ b/opends/src/server/org/opends/server/backends/TrustStoreBackend.java
@@ -1768,7 +1768,7 @@
{
String hostName =
SetupUtils.getHostNameForCertificate(DirectoryServer.getServerRoot());
- return "cn=" + Rdn.escapeValue(hostName) + ",O=OpenDS Certificate";
+ return "cn=" + Rdn.escapeValue(hostName) + ",O=OpenDJ Certificate";
}
/**
diff --git a/opends/src/server/org/opends/server/core/SubentryPasswordPolicy.java b/opends/src/server/org/opends/server/core/SubentryPasswordPolicy.java
index 06e9fc5..3d52026 100644
--- a/opends/src/server/org/opends/server/core/SubentryPasswordPolicy.java
+++ b/opends/src/server/org/opends/server/core/SubentryPasswordPolicy.java
@@ -51,8 +51,8 @@
/**
* This class represents subentry password policy based on Password Policy for
* LDAP Directories Internet-Draft. In order to represent subentry password
- * policies as OpenDS password policies it performs a mapping of Draft defined
- * attributes to OpenDS implementation specific attributes. Any missing
+ * policies as OpenDJ password policies it performs a mapping of Draft defined
+ * attributes to OpenDJ implementation specific attributes. Any missing
* attributes are inherited from server default password policy. This class is
* also reponsible for any Draft attributes validation ie making sure that
* provided values are acceptable and within the predefined range.
diff --git a/opends/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java b/opends/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java
index 92ed18d..131b803 100644
--- a/opends/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java
+++ b/opends/src/server/org/opends/server/extensions/CharacterSetPasswordValidator.java
@@ -49,7 +49,7 @@
/**
- * This class provides an OpenDS password validator that may be used to ensure
+ * This class provides an OpenDJ password validator that may be used to ensure
* that proposed passwords contain at least a specified number of characters
* from one or more user-defined character sets.
*/
diff --git a/opends/src/server/org/opends/server/servicetag/ServiceTagRegistration.java b/opends/src/server/org/opends/server/servicetag/ServiceTagRegistration.java
index cddc78f..de02c38 100644
--- a/opends/src/server/org/opends/server/servicetag/ServiceTagRegistration.java
+++ b/opends/src/server/org/opends/server/servicetag/ServiceTagRegistration.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.servicetag;
@@ -471,11 +472,11 @@
System.out.println("Usage:");
System.out.print(" " + ServiceTagRegistration.class.getName());
System.out.println(" [-delete|-register|-help]");
- System.out.println(" to delete/register a OpenDS ServiceTags");
+ System.out.println(" to delete/register a OpenDJ ServiceTags");
System.out.println("");
System.out.println("Options:");
- System.out.println(" -delete : to delete the OpenDS ServiceTags");
- System.out.println(" -register: to register the OpenDS ServiceTags");
+ System.out.println(" -delete : to delete the OpenDJ ServiceTags");
+ System.out.println(" -register: to register the OpenDJ ServiceTags");
System.out.println(" -help : to print this help message");
}
}
diff --git a/opends/src/server/org/opends/server/types/AbstractOperation.java b/opends/src/server/org/opends/server/types/AbstractOperation.java
index b02e4f7..1eaf23d 100644
--- a/opends/src/server/org/opends/server/types/AbstractOperation.java
+++ b/opends/src/server/org/opends/server/types/AbstractOperation.java
@@ -54,7 +54,7 @@
* functionality appropriate for the type of operation.
* <BR><BR>
* Note that this class is not intended to be subclassed by any
- * third-party code outside of the OpenDS project. It should only be
+ * third-party code outside of the OpenDJ project. It should only be
* extended by the operation types included in the
* {@code org.opends.server.core} package.
*/
diff --git a/opends/src/server/org/opends/server/util/SetupUtils.java b/opends/src/server/org/opends/server/util/SetupUtils.java
index b3268b3..c77fb0f 100644
--- a/opends/src/server/org/opends/server/util/SetupUtils.java
+++ b/opends/src/server/org/opends/server/util/SetupUtils.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.util;
@@ -185,7 +186,7 @@
int numEntries)
throws IOException
{
- File templateFile = File.createTempFile("opends-install", ".template");
+ File templateFile = File.createTempFile("opendj-install", ".template");
templateFile.deleteOnExit();
LinkedList<String> lines = new LinkedList<String>();
@@ -655,7 +656,7 @@
/**
* Returns the host name to be used to create self-signed certificates. <br>
* The method will first try to read the host name file written by the setup
- * where the user provided the host name where OpenDS has been installed. If
+ * where the user provided the host name where OpenDJ has been installed. If
* the file cannot be read, the class {@link java.net.InetAddress} is used.
*
* @param installationRoot the path where the server is installed.
diff --git a/opends/src/server/org/opends/server/util/StaticUtils.java b/opends/src/server/org/opends/server/util/StaticUtils.java
index 6791e53..87d6caf 100644
--- a/opends/src/server/org/opends/server/util/StaticUtils.java
+++ b/opends/src/server/org/opends/server/util/StaticUtils.java
@@ -1570,7 +1570,7 @@
/**
* Retrieves the best human-readable message for the provided exception. For
- * exceptions defined in the OpenDS project, it will attempt to use the
+ * exceptions defined in the OpenDJ project, it will attempt to use the
* message (combining it with the message ID if available). For some
* exceptions that use encapsulation (e.g., InvocationTargetException), it
* will be unwrapped and the cause will be treated. For all others, the
diff --git a/opends/src/server/org/opends/server/util/VersionCompatibilityIssue.java b/opends/src/server/org/opends/server/util/VersionCompatibilityIssue.java
index 89d36d0..2b3fea2 100644
--- a/opends/src/server/org/opends/server/util/VersionCompatibilityIssue.java
+++ b/opends/src/server/org/opends/server/util/VersionCompatibilityIssue.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.util;
@@ -214,7 +215,7 @@
/**
* Unique descriptor of an event that created a flag day for one
- * or more versions of the OpenDS codebase.
+ * or more versions of the OpenDJ codebase.
*/
public enum Cause {
/**
@@ -360,7 +361,7 @@
*
* <ol>
* <li>IDs must be unique among different causes in all branches
- * of the OpenDS code.</li>
+ * of the OpenDJ code.</li>
*
* <li>Causes in different branches representing the same issue
* must have identical IDs.</li>
--
Gitblit v1.10.0