From a8b4738ccb535f4c62530bfb3caf543a5b48e357 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Wed, 09 Nov 2011 11:59:59 +0000
Subject: [PATCH] Fix for OPENDJ-222 : More fixes, rebranded all temp files, some resources, fixed more messages...
---
opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java | 3 +
opends/src/admin/messages/TaskBackendCfgDefn_zh_CN.properties | 2
opends/src/admin/messages/TaskBackendCfgDefn_ko.properties | 2
opends/resource/admin/config-guide/opendj-config.css | 0
opends/src/admin/messages/TaskBackendCfgDefn_ja.properties | 2
opends/src/quicksetup/org/opends/quicksetup/upgrader/RemoteBuildManager.java | 5 +-
opends/src/admin/messages/TaskBackendCfgDefn.properties | 2
opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java | 2
opends/src/admin/defn/org/opends/server/admin/std/SNMPConnectionHandlerConfiguration.xml | 2
opends/src/admin/messages/TaskBackendCfgDefn_fr.properties | 2
opends/src/admin/messages/TaskBackendCfgDefn_zh_TW.properties | 2
opends/src/quicksetup/org/opends/quicksetup/Constants.java | 3 +
opends/src/snmp/resource/security/opendj-snmp.security | 0
opends/src/admin/messages/TaskBackendCfgDefn_es.properties | 2
opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 2
opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java | 3 +
opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java | 3 +
opends/src/server/org/opends/server/tools/InstallDS.java | 3 +
opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java | 3 +
opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java | 3 +
opends/src/messages/messages/quicksetup_ko.properties | 2
opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java | 2
opends/src/server/org/opends/server/tools/status/StatusCli.java | 3 +
opends/src/admin/defn/org/opends/server/admin/std/TaskBackendConfiguration.xml | 10 ++--
opends/src/admin/messages/TaskBackendCfgDefn_de.properties | 2
opends/src/quicksetup/org/opends/quicksetup/ui/WebBrowserErrorDialog.java | 3 +
opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java | 3 +
opends/src/messages/messages/utility_de.properties | 4 +-
opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java | 3 +
opends/src/server/org/opends/server/backends/task/TaskBackend.java | 9 ++--
opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java | 5 +-
31 files changed, 53 insertions(+), 39 deletions(-)
diff --git a/opends/resource/admin/config-guide/opends-config.css b/opends/resource/admin/config-guide/opendj-config.css
similarity index 100%
rename from opends/resource/admin/config-guide/opends-config.css
rename to opends/resource/admin/config-guide/opendj-config.css
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/SNMPConnectionHandlerConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/SNMPConnectionHandlerConfiguration.xml
index 4783b75..4692e0f 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/SNMPConnectionHandlerConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/SNMPConnectionHandlerConfiguration.xml
@@ -288,7 +288,7 @@
<adm:default-behavior>
<adm:defined>
<adm:value>
- config/snmp/security/opends-snmp.security
+ config/snmp/security/opendj-snmp.security
</adm:value>
</adm:defined>
</adm:default-behavior>
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/TaskBackendConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/TaskBackendConfiguration.xml
index edbfe58..40e5197 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/TaskBackendConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/TaskBackendConfiguration.xml
@@ -37,10 +37,10 @@
be convenient to perform remotely.
</adm:synopsis>
<adm:description>
- <adm:product-name /> supports tasks to backup and restore backends, to import and export LDIF
+ <adm:product-name /> supports tasks to backup and restore backends, to import and export LDIF
files, and to stop and restart the server. The details of a task are
- in an entry that is below the root of the Task Backend. The Task Backend
- is responsible for decoding that task entry and ensuring that it is processed
+ in an entry that is below the root of the Task Backend. The Task Backend
+ is responsible for decoding that task entry and ensuring that it is processed
as requested. Tasks may be invoked immediately, but they may also be scheduled for execution at
some future time. The task backend can also process recurring tasks to
ensure that maintenance operations (for example, backups) are
@@ -109,14 +109,14 @@
<adm:property name="notification-sender-address">
<adm:synopsis>
Specifies the email address to use as the sender (that is,
- the "From:" address) address for notification mail messages generated
+ the "From:" address) address for notification mail messages generated
when a task completes execution.
</adm:synopsis>
<adm:default-behavior>
<adm:alias>
<adm:synopsis>
The default sender address used is
- "opends-task-notification@" followed by the canonical address
+ "opendj-task-notification@" followed by the canonical address
of the system on which the server is running.
</adm:synopsis>
</adm:alias>
diff --git a/opends/src/admin/messages/TaskBackendCfgDefn.properties b/opends/src/admin/messages/TaskBackendCfgDefn.properties
index f4ac2e3..940b69b 100644
--- a/opends/src/admin/messages/TaskBackendCfgDefn.properties
+++ b/opends/src/admin/messages/TaskBackendCfgDefn.properties
@@ -11,7 +11,7 @@
property.enabled.description=If a backend is not enabled, then its contents are not accessible when processing operations.
property.java-class.synopsis=Specifies the fully-qualified name of the Java class that provides the backend implementation.
property.notification-sender-address.synopsis=Specifies the email address to use as the sender (that is, the "From:" address) address for notification mail messages generated when a task completes execution.
-property.notification-sender-address.default-behavior.alias.synopsis=The default sender address used is "opends-task-notification@" followed by the canonical address of the system on which the server is running.
+property.notification-sender-address.default-behavior.alias.synopsis=The default sender address used is "opendj-task-notification@" followed by the canonical address of the system on which the server is running.
property.task-backing-file.synopsis=Specifies the path to the backing file for storing information about the tasks configured in the server.
property.task-backing-file.description=It may be either an absolute path or a relative path to the base of the OpenDJ directory server instance.
property.task-retention-time.synopsis=Specifies the length of time that task entries should be retained after processing on the associated task has been completed.
diff --git a/opends/src/admin/messages/TaskBackendCfgDefn_de.properties b/opends/src/admin/messages/TaskBackendCfgDefn_de.properties
index 4686250..f433016 100644
--- a/opends/src/admin/messages/TaskBackendCfgDefn_de.properties
+++ b/opends/src/admin/messages/TaskBackendCfgDefn_de.properties
@@ -11,7 +11,7 @@
property.enabled.description=Wenn der Backend nicht aktiviert ist, ist sein Inhalt beim Verarbeiten von Vorg\u00e4ngen nicht zug\u00e4nglich.
property.java-class.synopsis=Gibt den vollst\u00e4ndig qualifizierten Namen der Java-Klasse an, die die Backend-Implementierung bereitstellt.
property.notification-sender-address.synopsis=Gibt die E-Mailadressen an, die als Absenderadresse f\u00fcr Benachrichtigungs-Mails verwendet werden (die Adresse "From:"), die nach einer abgeschlossenen Aufgabenausf\u00fchrung erstellt werden.
-property.notification-sender-address.default-behavior.alias.synopsis=Die standardm\u00e4\u00dfig verwendete Absenderadresse ist "opends-task-notification@", auf die die kanonische Adresse des Systems folgt, auf dem der Server ausgef\u00fchrt wird.
+property.notification-sender-address.default-behavior.alias.synopsis=Die standardm\u00e4\u00dfig verwendete Absenderadresse ist "opendj-task-notification@", auf die die kanonische Adresse des Systems folgt, auf dem der Server ausgef\u00fchrt wird.
property.task-backing-file.synopsis=Gibt den Pfad zum Sichern der Datei f\u00fcr die Speicherung von Informationen von Aufgaben an, die auf dem Server konfiguriert sind.
property.task-backing-file.description=Es kann sich um einen absoluten Pfad oder einen Pfad handeln, der relativ zur OpenDJ-Directory-Server-Instanz ist.
property.task-retention-time.synopsis=Gibt die Zeitspanne an, in der Aufgabeneintr\u00e4ge nach der Verarbeitung der verkn\u00fcpften Aufgaben beibehalten werden.
diff --git a/opends/src/admin/messages/TaskBackendCfgDefn_es.properties b/opends/src/admin/messages/TaskBackendCfgDefn_es.properties
index 1e1a2e1..d59f810 100644
--- a/opends/src/admin/messages/TaskBackendCfgDefn_es.properties
+++ b/opends/src/admin/messages/TaskBackendCfgDefn_es.properties
@@ -11,7 +11,7 @@
property.enabled.description=Si un servidor de fondo (backend) no est\u00e1 habilitado, no se podr\u00e1 acceder a su contenido cuando haya operaciones en proceso.
property.java-class.synopsis=Especifica el nombre completo de la clase de Java que proporciona la implementaci\u00f3n del servidor de fondo (backend).
property.notification-sender-address.synopsis=Especifica la direcci\u00f3n de correo electr\u00f3nico que se utilizar\u00e1 como direcci\u00f3n del remitente (es decir, la direcci\u00f3n "De:") en los mensajes de notificaci\u00f3n generados cuando finaliza la ejecuci\u00f3n de una tarea.
-property.notification-sender-address.default-behavior.alias.synopsis=La direcci\u00f3n predeterminada del remitente es "opends-task-notification@" seguida de la direcci\u00f3n can\u00f3nica del sistema en el que se est\u00e9 ejecutando el servidor.
+property.notification-sender-address.default-behavior.alias.synopsis=La direcci\u00f3n predeterminada del remitente es "opendj-task-notification@" seguida de la direcci\u00f3n can\u00f3nica del sistema en el que se est\u00e9 ejecutando el servidor.
property.task-backing-file.synopsis=Especifica la ruta al archivo de copia de seguridad utilizado para almacenar la informaci\u00f3n de las tareas configuradas en el servidor.
property.task-backing-file.description=Puede tratarse de una ruta absoluta o de una ruta relativa a la base de la instancia de OpenDJ.
property.task-retention-time.synopsis=Especifica el periodo de tiempo que se conservar\u00e1n las entradas de tareas una vez finalizado su procesamiento en la tarea asociada.
diff --git a/opends/src/admin/messages/TaskBackendCfgDefn_fr.properties b/opends/src/admin/messages/TaskBackendCfgDefn_fr.properties
index fdc4205..fd1b447 100644
--- a/opends/src/admin/messages/TaskBackendCfgDefn_fr.properties
+++ b/opends/src/admin/messages/TaskBackendCfgDefn_fr.properties
@@ -11,7 +11,7 @@
property.enabled.description=Lorsqu\u2019un backend n\u2019est pas activ\u00e9, son contenu n\u2019est pas accessible lors du traitement des op\u00e9rations.
property.java-class.synopsis=Sp\u00e9cifie le nom complet de la classe Java qui fournit l\u2019impl\u00e9mentation du backend.
property.notification-sender-address.synopsis=Sp\u00e9cifie l'adresse \u00e9lectronique \u00e0 utiliser comme adresse de l'exp\u00e9diteur (c'est-\u00e0-dire l'adresse "De :") pour des messages \u00e9lectroniques de notification g\u00e9n\u00e9r\u00e9s \u00e0 la fin de l'ex\u00e9cution d'une t\u00e2che.
-property.notification-sender-address.default-behavior.alias.synopsis=L'adresse de l'exp\u00e9diteur par d\u00e9faut utilis\u00e9e est "opends-task-notification@" suivie de l'adresse canonique du syst\u00e8me sur lequel le syst\u00e8me s'ex\u00e9cute.
+property.notification-sender-address.default-behavior.alias.synopsis=L'adresse de l'exp\u00e9diteur par d\u00e9faut utilis\u00e9e est "opendj-task-notification@" suivie de l'adresse canonique du syst\u00e8me sur lequel le syst\u00e8me s'ex\u00e9cute.
property.task-backing-file.synopsis=Sp\u00e9cifie le chemin vers le fichier de secours pour stocker des informations relatives aux t\u00e2ches configur\u00e9es dans le serveur.
property.task-backing-file.description=Il peut s'agir d'un chemin absolu ou d'un chemin relatif vers la base de l'instance du serveur d'annuaire OpenDJ.
property.task-retention-time.synopsis=Sp\u00e9cifie la dur\u00e9e pendant laquelle les entr\u00e9es de t\u00e2ches doivent \u00eatre conserv\u00e9es apr\u00e8s le traitement sur la t\u00e2che associ\u00e9e.
diff --git a/opends/src/admin/messages/TaskBackendCfgDefn_ja.properties b/opends/src/admin/messages/TaskBackendCfgDefn_ja.properties
index dadf39a..453473f 100644
--- a/opends/src/admin/messages/TaskBackendCfgDefn_ja.properties
+++ b/opends/src/admin/messages/TaskBackendCfgDefn_ja.properties
@@ -11,7 +11,7 @@
property.enabled.description=\u30d0\u30c3\u30af\u30a8\u30f3\u30c9\u304c\u4f7f\u7528\u53ef\u80fd\u3067\u306a\u3044\u5834\u5408\u3001\u64cd\u4f5c\u306e\u51e6\u7406\u6642\u306b\u305d\u306e\u5185\u5bb9\u306b\u30a2\u30af\u30bb\u30b9\u3059\u308b\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093\u3002
property.java-class.synopsis=\u30d0\u30c3\u30af\u30a8\u30f3\u30c9\u306e\u5b9f\u88c5\u3092\u63d0\u4f9b\u3059\u308b Java \u30af\u30e9\u30b9\u306e\u5b8c\u5168\u4fee\u98fe\u540d\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
property.notification-sender-address.synopsis=\u30bf\u30b9\u30af\u304c\u5b9f\u884c\u3092\u5b8c\u4e86\u3059\u308b\u3068\u304d\u306b\u751f\u6210\u3055\u308c\u308b\u901a\u77e5\u30e1\u30fc\u30eb\u30e1\u30c3\u30bb\u30fc\u30b8\u306e\u9001\u4fe1\u5074\u30a2\u30c9\u30ec\u30b9 (\u3064\u307e\u308a\u3001\u300cFrom:\u300d\u30a2\u30c9\u30ec\u30b9) \u3068\u3057\u3066\u4f7f\u7528\u3059\u308b\u96fb\u5b50\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
-property.notification-sender-address.default-behavior.alias.synopsis=\u4f7f\u7528\u3055\u308c\u3066\u3044\u308b\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u9001\u4fe1\u5074\u30a2\u30c9\u30ec\u30b9\u306f\u3001\u300copends-task-notification@\u300d\u306e\u3042\u3068\u306b\u3001\u30b5\u30fc\u30d0\u30fc\u304c\u7a3c\u50cd\u3057\u3066\u3044\u308b\u30b7\u30b9\u30c6\u30e0\u306e\u6a19\u6e96\u7684\u306a\u30a2\u30c9\u30ec\u30b9\u3092\u7d9a\u3051\u305f\u3082\u306e\u3067\u3059\u3002
+property.notification-sender-address.default-behavior.alias.synopsis=\u4f7f\u7528\u3055\u308c\u3066\u3044\u308b\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u9001\u4fe1\u5074\u30a2\u30c9\u30ec\u30b9\u306f\u3001\u300copendj-task-notification@\u300d\u306e\u3042\u3068\u306b\u3001\u30b5\u30fc\u30d0\u30fc\u304c\u7a3c\u50cd\u3057\u3066\u3044\u308b\u30b7\u30b9\u30c6\u30e0\u306e\u6a19\u6e96\u7684\u306a\u30a2\u30c9\u30ec\u30b9\u3092\u7d9a\u3051\u305f\u3082\u306e\u3067\u3059\u3002
property.task-backing-file.synopsis=\u30b5\u30fc\u30d0\u30fc\u3067\u69cb\u6210\u3055\u308c\u305f\u30bf\u30b9\u30af\u306b\u95a2\u3059\u308b\u60c5\u5831\u3092\u683c\u7d0d\u3059\u308b\u305f\u3081\u306e\u30d0\u30c3\u30ad\u30f3\u30b0\u30d5\u30a1\u30a4\u30eb\u306e\u30d1\u30b9\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
property.task-backing-file.description=\u3053\u308c\u306f\u3001\u7d76\u5bfe\u30d1\u30b9\u3068\u307e\u305f\u306f OpenDJ \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30b5\u30fc\u30d0\u30fc\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u30d9\u30fc\u30b9\u306b\u5bfe\u3059\u308b\u76f8\u5bfe\u30d1\u30b9\u306e\u3069\u3061\u3089\u3067\u3082\u304b\u307e\u3044\u307e\u305b\u3093\u3002
property.task-retention-time.synopsis=\u95a2\u9023\u4ed8\u3051\u3089\u308c\u305f\u30bf\u30b9\u30af\u3067\u306e\u51e6\u7406\u304c\u5b8c\u4e86\u3057\u305f\u3042\u3068\u3001\u30bf\u30b9\u30af\u30a8\u30f3\u30c8\u30ea\u3092\u4fdd\u6301\u3059\u308b\u6642\u9593\u306e\u9577\u3055\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
diff --git a/opends/src/admin/messages/TaskBackendCfgDefn_ko.properties b/opends/src/admin/messages/TaskBackendCfgDefn_ko.properties
index ce84285..be49310 100644
--- a/opends/src/admin/messages/TaskBackendCfgDefn_ko.properties
+++ b/opends/src/admin/messages/TaskBackendCfgDefn_ko.properties
@@ -11,7 +11,7 @@
property.enabled.description=If a backend is not enabled, then its contents are not accessible when processing operations.
property.java-class.synopsis=Specifies the fully-qualified name of the Java class that provides the backend implementation.
property.notification-sender-address.synopsis=Specifies the email address to use as the sender (that is, the "From:" address) address for notification mail messages generated when a task completes execution.
-property.notification-sender-address.default-behavior.alias.synopsis=The default sender address used is "opends-task-notification@" followed by the canonical address of the system on which the server is running.
+property.notification-sender-address.default-behavior.alias.synopsis=The default sender address used is "opendj-task-notification@" followed by the canonical address of the system on which the server is running.
property.task-backing-file.synopsis=Specifies the path to the backing file for storing information about the tasks configured in the server.
property.task-backing-file.description=It may be either an absolute path or a relative path to the base of the OpenDJ instance.
property.task-retention-time.synopsis=Specifies the length of time that task entries should be retained after processing on the associated task has been completed.
diff --git a/opends/src/admin/messages/TaskBackendCfgDefn_zh_CN.properties b/opends/src/admin/messages/TaskBackendCfgDefn_zh_CN.properties
index 8fad5ff..88986a1 100644
--- a/opends/src/admin/messages/TaskBackendCfgDefn_zh_CN.properties
+++ b/opends/src/admin/messages/TaskBackendCfgDefn_zh_CN.properties
@@ -11,7 +11,7 @@
property.enabled.description=\u5982\u679c\u672a\u542f\u7528\u540e\u7aef\uff0c\u5219\u5728\u5904\u7406\u64cd\u4f5c\u65f6\u5c06\u65e0\u6cd5\u8bbf\u95ee\u5176\u5185\u5bb9\u3002
property.java-class.synopsis=\u6307\u5b9a\u63d0\u4f9b\u540e\u7aef\u5b9e\u73b0\u7684 Java \u7c7b\u7684\u5168\u9650\u5b9a\u540d\u3002
property.notification-sender-address.synopsis=\u6307\u5b9a\u5f53\u5b8c\u6210\u6267\u884c\u4efb\u52a1\u540e\uff0c\u8981\u7528\u4f5c\u751f\u6210\u7684\u901a\u77e5\u7535\u5b50\u90ae\u4ef6\u6d88\u606f\u7684\u53d1\u9001\u65b9\uff08\u4e5f\u5c31\u662f\u201c\u53d1\u4ef6\u4eba: \u201d\u5730\u5740\uff09\u5730\u5740\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u3002
-property.notification-sender-address.default-behavior.alias.synopsis=\u4f7f\u7528\u7684\u9ed8\u8ba4\u53d1\u4ef6\u4eba\u5730\u5740\u4e3a\u201copends-task-notification@\u201d\uff0c\u540e\u8ddf\u670d\u52a1\u5668\u8fd0\u884c\u6240\u5728\u7cfb\u7edf\u7684\u6807\u51c6\u5730\u5740\u3002
+property.notification-sender-address.default-behavior.alias.synopsis=\u4f7f\u7528\u7684\u9ed8\u8ba4\u53d1\u4ef6\u4eba\u5730\u5740\u4e3a\u201copendj-task-notification@\u201d\uff0c\u540e\u8ddf\u670d\u52a1\u5668\u8fd0\u884c\u6240\u5728\u7cfb\u7edf\u7684\u6807\u51c6\u5730\u5740\u3002
property.task-backing-file.synopsis=\u6307\u5b9a\u7528\u4e8e\u5b58\u50a8\u5173\u4e8e\u670d\u52a1\u5668\u4e2d\u6240\u914d\u7f6e\u4e4b\u4efb\u52a1\u7684\u4fe1\u606f\u7684\u5907\u4efd\u6587\u4ef6\u7684\u8def\u5f84\u3002
property.task-backing-file.description=\u53ef\u4ee5\u662f\u7edd\u5bf9\u8def\u5f84\uff0c\u4e5f\u53ef\u4ee5\u662f\u76f8\u5bf9\u8def\u5f84\uff0c\u5177\u4f53\u53d6\u51b3\u4e8e OpenDJ \u5b9e\u4f8b\u3002
property.task-retention-time.synopsis=\u6307\u5b9a\u5728\u5904\u7406\u5df2\u5b8c\u6210\u5173\u8054\u4efb\u52a1\u4e4b\u540e\uff0c\u5e94\u5f53\u4fdd\u7559\u4efb\u52a1\u7684\u65f6\u95f4\u3002
diff --git a/opends/src/admin/messages/TaskBackendCfgDefn_zh_TW.properties b/opends/src/admin/messages/TaskBackendCfgDefn_zh_TW.properties
index ce84285..be49310 100644
--- a/opends/src/admin/messages/TaskBackendCfgDefn_zh_TW.properties
+++ b/opends/src/admin/messages/TaskBackendCfgDefn_zh_TW.properties
@@ -11,7 +11,7 @@
property.enabled.description=If a backend is not enabled, then its contents are not accessible when processing operations.
property.java-class.synopsis=Specifies the fully-qualified name of the Java class that provides the backend implementation.
property.notification-sender-address.synopsis=Specifies the email address to use as the sender (that is, the "From:" address) address for notification mail messages generated when a task completes execution.
-property.notification-sender-address.default-behavior.alias.synopsis=The default sender address used is "opends-task-notification@" followed by the canonical address of the system on which the server is running.
+property.notification-sender-address.default-behavior.alias.synopsis=The default sender address used is "opendj-task-notification@" followed by the canonical address of the system on which the server is running.
property.task-backing-file.synopsis=Specifies the path to the backing file for storing information about the tasks configured in the server.
property.task-backing-file.description=It may be either an absolute path or a relative path to the base of the OpenDJ instance.
property.task-retention-time.synopsis=Specifies the length of time that task entries should be retained after processing on the associated task has been completed.
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
index d4b80d0..c59508a 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.controlpanel;
@@ -58,7 +59,7 @@
static private ControlPanelArgumentParser argParser;
/** Prefix for log files. */
- static public final String LOG_FILE_PREFIX = "opends-control-panel-";
+ static public final String LOG_FILE_PREFIX = "opendj-control-panel-";
/** Suffix for log files. */
static public final String LOG_FILE_SUFFIX = ".log";
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java
index 9ca4144..97b08f3 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/BackupListPanel.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -503,7 +504,7 @@
worker.startBackgroundTask();
}
- private final String DUMMY_PARENT_PATH = "/local/OpenDS-X.X.X/bak";
+ private final String DUMMY_PARENT_PATH = "/local/OpenDJ-X.X.X/bak";
/**
* Creates a list with backup descriptor. This is done simply to have a good
* initial size for the table.
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 800e1a8..e7421f8 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewBaseDNPanel.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.controlpanel.ui;
@@ -1062,7 +1063,7 @@
Integer.parseInt(nEntries));
if (!isLocal())
{
- File tempFile = File.createTempFile("opends-control-panel",
+ File tempFile = File.createTempFile("opendj-control-panel",
".ldif");
tempFile.deleteOnExit();
ldifFile = tempFile.getAbsolutePath();
diff --git a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
index 69c314e..da9650d 100644
--- a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
+++ b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.guitools.uninstaller;
@@ -54,7 +55,7 @@
public class UninstallLauncher extends Launcher {
/** Prefix for log files. */
- static public final String LOG_FILE_PREFIX = "opends-uninstall-";
+ static public final String LOG_FILE_PREFIX = "opendj-uninstall-";
/** Suffix for log files. */
static public final String LOG_FILE_SUFFIX = ".log";
diff --git a/opends/src/messages/messages/quicksetup_ko.properties b/opends/src/messages/messages/quicksetup_ko.properties
index cf13e11..b49ab47 100644
--- a/opends/src/messages/messages/quicksetup_ko.properties
+++ b/opends/src/messages/messages/quicksetup_ko.properties
@@ -856,7 +856,7 @@
INFO_WEB_PROXY_DLG_PORT_LABEL=\ud3ec\ud2b8:
INFO_WEB_PROXY_DLG_TITLE=\uc6f9 \ud504\ub85d\uc2dc \uad6c\uc131
INFO_WEB_PROXY_DLG_USER_LABEL=\uc0ac\uc6a9\uc790:
-INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=OpenDJ \ube60\ub978 \uc124\uce58 \ub3c4\uad6c\ub294 \uc0ac\uc6a9\uc790\uc5d0\uac8c \uae30\ubcf8 \uc11c\ubc84 \ubc0f \ub370\uc774\ud130 \uad6c\uc131 \uc124\uc815\uc5d0 \ub300\ud55c \uba87 \uac00\uc9c0 \uc9c8\ubb38\uc744 \ud55c \ud6c4 \uc11c\ubc84\ub97c \uc2e0\uc18d\ud558\uac8c \uc2dc\uc791 \ubc0f \uc2e4\ud589\ud558\ub3c4\ub85d \ud569\ub2c8\ub2e4.<br><br><a href="www.forgerock.org/opendj.html">OpenDJ \ub2e4\uc6b4\ub85c\ub4dc \ud398\uc774\uc9c0</a>\uc5d0\uc11c Java Web Start\ub97c \ud1b5\ud574 \uc124\uce58\ub97c \uc2dc\uc791\ud558\ub294 \ucd5c\uc2e0 \uc8fc\uac04 \ub2e8\uc704 \ube4c\ub4dc\ub97c \uc124\uce58\ud560 \uc218\ub3c4 \uc788\uc2b5\ub2c8\ub2e4. \ube60\ub978 \uc124\uce58\uc758 \uc774 \uc778\uc2a4\ud134\uc2a4\uc5d0\uc11c \ub2e4\uc74c OpenDJ \ube4c\ub4dc\ub97c \uc0ac\uc6a9\ud569\ub2c8\ub2e4: %s(\ube4c\ub4dc \uc544\uc774\ub514: %s) <br><br> OpenDJ\uc5d0\ub294 Java SE 6.0 \uc774\uc0c1\uc758 \ub7f0\ud0c0\uc784\uc774 \ud544\uc694\ud569\ub2c8\ub2e4.<br><br> \ube60\ub978 \uc124\uce58\uc5d0 \ub300\ud55c \ucd94\uac00 \uc815\ubcf4\ub294 <a href="https://www.opends.org/wiki/page/OverviewOfTheQuickSetupTool"> OpenDJ \uc124\uba85\uc11c wiki</a>\uc5d0\uc11c \uc0ac\uc6a9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
+INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=%s \ube60\ub978 \uc124\uce58 \ub3c4\uad6c\ub294 \uc0ac\uc6a9\uc790\uc5d0\uac8c \uae30\ubcf8 \uc11c\ubc84 \ubc0f \ub370\uc774\ud130 \uad6c\uc131 \uc124\uc815\uc5d0 \ub300\ud55c \uba87 \uac00\uc9c0 \uc9c8\ubb38\uc744 \ud55c \ud6c4 \uc11c\ubc84\ub97c \uc2e0\uc18d\ud558\uac8c \uc2dc\uc791 \ubc0f \uc2e4\ud589\ud558\ub3c4\ub85d \ud569\ub2c8\ub2e4.<br><br> %s \uc5d0\ub294 Java SE 6.0 \uc774\uc0c1\uc758 \ub7f0\ud0c0\uc784\uc774 \ud544\uc694\ud569\ub2c8\ub2e4.<br><br> \ube60\ub978 \uc124\uce58\uc5d0 \ub300\ud55c \ucd94\uac00 \uc815\ubcf4\ub294 <a href="%s"> OpenDJ \uc124\uba85\uc11c </a>\uc5d0\uc11c \uc0ac\uc6a9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
INFO_WELCOME_PANEL_TITLE=\uc2dc\uc791
INFO_WELCOME_PANEL_WEBSTART_INSTRUCTIONS=%s \ube60\ub978 \uc124\uce58 \ub3c4\uad6c\ub294 \uc0ac\uc6a9\uc790\uc5d0\uac8c \uae30\ubcf8 \uc11c\ubc84 \ubc0f \ub370\uc774\ud130 \uad6c\uc131 \uc124\uc815\uc5d0 \ub300\ud55c \uba87 \uac00\uc9c0 \uc9c8\ubb38\uc744 \ud55c \ud6c4 \uc11c\ubc84\ub97c \uc2e0\uc18d\ud558\uac8c \uc2dc\uc791 \ubc0f \uc2e4\ud589\ud558\ub3c4\ub85d \ud569\ub2c8\ub2e4.<br><br>\ube60\ub978 \uc124\uce58\ub97c \uc0ac\uc6a9\ud558\uc5ec \uc218\ub3d9\uc73c\ub85c \ub2e4\uc6b4\ub85c\ub4dc\ud55c \uc8fc\uac04 \ube4c\ub4dc\ub97c \uc124\uce58\ud560 \uc218\ub3c4 \uc788\uc2b5\ub2c8\ub2e4. \uc774 \uacbd\uc6b0 \ube60\ub978 \uc124\uce58\ub97c \uc2e4\ud589\ud558\ub824\uba74 %s \ub514\ub809\ud1a0\ub9ac\uc758 \ucd5c\uc0c1\uc704 \uc218\uc900\uc5d0\uc11c %s \uba85\ub839\uc744 \uc0ac\uc6a9\ud569\ub2c8\ub2e4. \ube60\ub978 \uc124\uce58\uc758 \uc774 \uc778\uc2a4\ud134\uc2a4\uc5d0\uc11c \ub2e4\uc74c %s \ube4c\ub4dc\ub97c \uc0ac\uc6a9\ud569\ub2c8\ub2e4: %s(\ube4c\ub4dc \uc544\uc774\ub514: %s) <br><br> %s \uc5d0\ub294 Java SE 6.0 \uc774\uc0c1\uc758 \ub7f0\ud0c0\uc784\uc774 \ud544\uc694\ud569\ub2c8\ub2e4.<br><br> \ube60\ub978 \uc124\uce58\uc5d0 \ub300\ud55c \ucd94\uac00 \uc815\ubcf4\ub294 <a href="http://opendj.forgerock.org/doc/install-guide/OpenDJ-Install-Guide.html#chap-install-gui"> %s \uc124\uce58 \ub9e4\ub274\uc5bc</a>\uc5d0\uc11c \uc0ac\uc6a9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
INFO_WELCOME_STEP=\uc2dc\uc791
diff --git a/opends/src/messages/messages/utility_de.properties b/opends/src/messages/messages/utility_de.properties
index 4b4ba4d..8fe403d 100644
--- a/opends/src/messages/messages/utility_de.properties
+++ b/opends/src/messages/messages/utility_de.properties
@@ -55,7 +55,7 @@
MILD_ERR_LDIF_INVALID_LEADING_SPACE_5=Zeile %d ("%s") kann nicht von LDIF-Quelle geparst werden, da die Zeile mit einem Leerzeichen beginnt, es im Eintrag aber keine vorhergehenden Zeilen gibt, an die die Zeile angeh\u00e4ngt sein kann
MILD_ERR_LDIF_NO_ATTR_NAME_6=Der LDIF-Eintrag, der in Zeile %d beginnt, kann nicht geparst werden, da die Zeile "%s" keinen Attributnamen enth\u00e4lt
MILD_ERR_LDIF_NO_DN_7=Der LDIF-Eintrag, der in Zeile %d beginnt, kann nicht geparst werden, da die erste Zeile keinen DN enth\u00e4lt (die erste Zeile ist "%s")
-MILD_ERR_LDIF_INVALID_DN_SEPARATOR_8=Der LDIF-Eintrag, der in Zeile %d beginnt, kann nicht geparst werden, da die Zeile "%s" ein ung\u00fcltiges Trennzeichen zwischen dem Pr\u00e4fix "dn" und dem eigentlichen Distinguished Name (DN) enth\u00e4lt
+MILD_ERR_LDIF_INVALID_DN_SEPARATOR_8=Der LDIF-Eintrag, der in Zeile %d beginnt, kann nicht geparst werden, da die Zeile "%s" ein ung\u00fcltiges Trennzeichen zwischen dem Pr\u00e4fix "dn" und dem eigentlichen Distinguished Name (DN) enth\u00e4lt
MILD_ERR_LDIF_INVALID_DN_9=Der LDIF-Eintrag, der in Zeile %d beginnt, kann nicht geparst werden, da ein Fehler beim Versuch aufgetreten ist, den Wert aus Zeile "%s" als Distinguished Name (DN) zu parsen: %s
MILD_ERR_LDIF_INVALID_ATTR_SEPARATOR_10=Der LDIF-Eintrag %s, der in Zeile %d beginnt, kann nicht geparst werden, da die Zeile "%s" ein ung\u00fcltiges Trennzeichen zwischen dem Attributnamen und dem Wert enth\u00e4lt
MILD_ERR_LDIF_COULD_NOT_BASE64_DECODE_DN_11=Der LDIF-Eintrag, der in Zeile %d beginnt, kann nicht geparst werden, da der DN in Zeile "%s" nicht Base64-dekodiert werden konnte: %s
@@ -281,7 +281,7 @@
INFO_LDAP_CONN_PROMPT_SECURITY_KEYSTORE_PATH_233=Schl\u00fcsselspeicherpfad:
INFO_LDAP_CONN_PROMPT_SECURITY_KEYSTORE_PASSWORD_234=Passwort f\u00fcr Schl\u00fcsselspeicher '%s':
INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_NAME_235=Zertifikatspseudonym:
-INFO_LDAP_CONN_HEADING_CONNECTION_PARAMETERS_236=>>>> OpenDS-LDAP-Verbindungsparameter angeben
+INFO_LDAP_CONN_HEADING_CONNECTION_PARAMETERS_236=>>>> OpenDJ-LDAP-Verbindungsparameter angeben
SEVERE_ERR_LDAP_CONN_BAD_HOST_NAME_237=Der Hostname "%s" konnte nicht aufgel\u00f6st werden. Stellen Sie sicher, dass Sie die richtige Adresse angegeben haben
SEVERE_ERR_LDAP_CONN_BAD_PORT_NUMBER_238=Ung\u00fcltige Portnummer "%s". Geben Sie eine g\u00fcltige Portnummer zwischen 1 und 65535 ein
INFO_LDAP_CONN_PROMPT_HOST_NAME_239=Directory-Server-Hostname oder -IP-Adresse [%s]:
diff --git a/opends/src/quicksetup/org/opends/quicksetup/Constants.java b/opends/src/quicksetup/org/opends/quicksetup/Constants.java
index a6725fe..9443022 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Constants.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Constants.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.quicksetup;
@@ -98,7 +99,7 @@
public static final int MAX_CHARS_PER_LINE_IN_DIALOG = 100;
/** Prefix for log files. */
- public static final String LOG_FILE_PREFIX = "opends-setup-";
+ public static final String LOG_FILE_PREFIX = "opendj-setup-";
/** Suffix for log files. */
public static final String LOG_FILE_SUFFIX = ".log";
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
index 3e627d5..e87e5e5 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java
@@ -275,7 +275,7 @@
File ldifFile;
try
{
- ldifFile = File.createTempFile("opends-base-entry", ".ldif");
+ ldifFile = File.createTempFile("opendj-base-entry", ".ldif");
ldifFile.deleteOnExit();
} catch (IOException ioe)
{
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/WebBrowserErrorDialog.java b/opends/src/quicksetup/org/opends/quicksetup/ui/WebBrowserErrorDialog.java
index c9fa283..f675a2e 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/WebBrowserErrorDialog.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/WebBrowserErrorDialog.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.quicksetup.ui;
@@ -190,7 +191,7 @@
// UIFactory.initialize();
WebBrowserErrorDialog dlg =
new WebBrowserErrorDialog(new JFrame(),
- new WebBrowserException("http://opends.org",
+ new WebBrowserException("http://opendj.org",
Message.raw("toto"), null));
dlg.packAndShow();
} catch (Exception ex)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/RemoteBuildManager.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/RemoteBuildManager.java
index d03a712..b2dbbf4 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/RemoteBuildManager.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/RemoteBuildManager.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.quicksetup.upgrader;
@@ -45,7 +46,7 @@
import java.awt.*;
/**
- * Manages listing and retreival of build packages on a remote host.
+ * Manages listing and retrieval of build packages on a remote host.
*/
public class RemoteBuildManager {
@@ -69,7 +70,7 @@
/**
* Creates an instance.
* @param app using this tool
- * @param url base context for an OpenDS build list
+ * @param url base context for an OpenDJ build list
* @param proxy Proxy to use for connections; can be null if not proxy is
* to be used
*/
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
index 517012f..63d9171 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/UpgradeLauncher.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.quicksetup.upgrader;
@@ -56,7 +57,7 @@
public class UpgradeLauncher extends Launcher {
/** Prefix for log files. */
- static public final String LOG_FILE_PREFIX = "opends-upgrade-";
+ static public final String LOG_FILE_PREFIX = "opendj-upgrade-";
/** Short form of the option for specifying the installation package file. */
static public final Character FILE_OPTION_SHORT = 'f';
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
index ca7b8f9..b9aeafb 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/Upgrader.java
@@ -200,7 +200,7 @@
private File backupDirectory = null;
/**
- * ID that uniquely identifieds this invocation of the Upgrader in the
+ * ID that uniquely identifies this invocation of the Upgrader in the
* historical logs.
*/
private Long historicalOperationId;
@@ -327,7 +327,8 @@
String listUrlString =
System.getProperty("org.opends.quicksetup.upgrader.BuildList");
if (listUrlString == null) {
- listUrlString = "http://www.opends.org/upgrade-builds";
+ listUrlString =
+ "http://www.forgerock.org/downloads/opendj/upgrade-builds";
}
URL buildRepo = new URL(listUrlString);
diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java b/opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
index 13ce20e..b703003 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/ZipExtractor.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.quicksetup.util;
@@ -158,7 +159,7 @@
* be extracted
* @param removeFirstPath when true removes each zip entry's initial path
* when copied to the destination folder. So for instance if the zip entry's
- * name was /OpenDS-0.8/some_file the file would appear in the destination
+ * name was /OpenDJ-2.4.x/some_file the file would appear in the destination
* directory as 'some_file'.
* @throws ApplicationException if something goes wrong
*/
diff --git a/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java b/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
index b0d5aba..01c69a0 100644
--- a/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
+++ b/opends/src/server/org/opends/server/admin/doc/ConfigGuideGeneration.java
@@ -60,7 +60,7 @@
"/doc/admin-guide/OpenDJ-Admin-Guide.html#chap-privileges-acis";
private final static String DURATION_SYNTAX_REL_URL =
"duration-syntax.html";
- private final String CSS_FILE = "opends-config.css";
+ private final String CSS_FILE = "opendj-config.css";
private final String MAIN_FILE = "index.html";
private final String INHERITANCE_TREE_FILE =
diff --git a/opends/src/server/org/opends/server/backends/task/TaskBackend.java b/opends/src/server/org/opends/server/backends/task/TaskBackend.java
index 8b6bfbf..e182567 100644
--- a/opends/src/server/org/opends/server/backends/task/TaskBackend.java
+++ b/opends/src/server/org/opends/server/backends/task/TaskBackend.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.backends.task;
@@ -267,12 +268,12 @@
{
try
{
- notificationSenderAddress = "opends-task-notification@" +
+ notificationSenderAddress = "opendj-task-notification@" +
InetAddress.getLocalHost().getCanonicalHostName();
}
catch (Exception e)
{
- notificationSenderAddress = "opends-task-notification@opends.org";
+ notificationSenderAddress = "opendj-task-notification@opendj.org";
}
}
@@ -2231,12 +2232,12 @@
{
try
{
- tmpNotificationAddress = "opends-task-notification@" +
+ tmpNotificationAddress = "opendj-task-notification@" +
InetAddress.getLocalHost().getCanonicalHostName();
}
catch (Exception e)
{
- tmpNotificationAddress = "opends-task-notification@opends.org";
+ tmpNotificationAddress = "opendj-task-notification@opendj.org";
}
}
notificationSenderAddress = tmpNotificationAddress;
diff --git a/opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java b/opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java
index 039da6c..6d895fc 100644
--- a/opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/opends/src/server/org/opends/server/crypto/CryptoManagerImpl.java
@@ -24,6 +24,7 @@
*
* Copyright 2006-2010 Sun Microsystems, Inc.
* Portions Copyright 2009 Parametric Technology Corporation (PTC)
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.crypto;
@@ -92,7 +93,7 @@
which is described in the
<a href="https://www.opends.org/wiki//page/TheCryptoManager">
CrytpoManager design document</a>. {@code CryptoManager} implements
- inter-OpenDS-instance authentication and authorization using the
+ inter-OpenDJ-instance authentication and authorization using the
ADS-based truststore, and secret key distribution. The interface also
provides methods for hashing, encryption, and other kinds of
cryptographic operations.
diff --git a/opends/src/server/org/opends/server/tools/InstallDS.java b/opends/src/server/org/opends/server/tools/InstallDS.java
index 20414f0..b4bf736 100644
--- a/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.tools;
@@ -98,7 +99,7 @@
private final PlainTextProgressMessageFormatter formatter =
new PlainTextProgressMessageFormatter();
/** Prefix for log files. */
- static public final String LOG_FILE_PREFIX = "opends-setup-";
+ static public final String LOG_FILE_PREFIX = "opendj-setup-";
/** Suffix for log files. */
static public final String LOG_FILE_SUFFIX = ".log";
diff --git a/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index c072205..b2e638b 100644
--- a/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opends/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -169,7 +169,7 @@
private static final String CLASS_NAME = ReplicationCliMain.class.getName();
/** Prefix for log files. */
- static public final String LOG_FILE_PREFIX = "opends-replication-";
+ static public final String LOG_FILE_PREFIX = "opendj-replication-";
/** Suffix for log files. */
static public final String LOG_FILE_SUFFIX = ".log";
diff --git a/opends/src/server/org/opends/server/tools/status/StatusCli.java b/opends/src/server/org/opends/server/tools/status/StatusCli.java
index 0c28efb..6eaccd8 100644
--- a/opends/src/server/org/opends/server/tools/status/StatusCli.java
+++ b/opends/src/server/org/opends/server/tools/status/StatusCli.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2011 ForgeRock AS
*/
package org.opends.server.tools.status;
@@ -97,7 +98,7 @@
private boolean displayMustStartLegend;
/** Prefix for log files. */
- static public final String LOG_FILE_PREFIX = "opends-status-";
+ static public final String LOG_FILE_PREFIX = "opendj-status-";
/** Suffix for log files. */
static public final String LOG_FILE_SUFFIX = ".log";
diff --git a/opends/src/snmp/resource/security/opends-snmp.security b/opends/src/snmp/resource/security/opendj-snmp.security
similarity index 100%
rename from opends/src/snmp/resource/security/opends-snmp.security
rename to opends/src/snmp/resource/security/opendj-snmp.security
--
Gitblit v1.10.0