From e2aaf01e611fe8b1563c07d649b7d7469ebdd1f6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 14 Feb 2014 11:41:35 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 : Migrate I18n and logging support to i18n framework and SLF4J
---
opendj3-server-dev/src/messages/messages/tools.properties | 4 ++++
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java | 6 +++---
opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/opendj3-server-dev/src/messages/messages/tools.properties b/opendj3-server-dev/src/messages/messages/tools.properties
index 9960fe4..f127ce2 100644
--- a/opendj3-server-dev/src/messages/messages/tools.properties
+++ b/opendj3-server-dev/src/messages/messages/tools.properties
@@ -2583,3 +2583,7 @@
INFO_UPGRADE_TASK_10133_1_SUMMARY_10021=Changing matching rule for 'userCertificate' and \
'caCertificate' to CertificateExactMatch
INFO_UPGRADE_TASK_10133_2_SUMMARY_10022=Configuring 'CertificateExactMatch' matching rule
+INFO_UPGRADE_TASK_10214_1_SUMMARY_10023=Updating ds-cfg-java-class attribute in File-Based Debug Logger
+INFO_UPGRADE_TASK_10232_1_SUMMARY_10024=Deleting ds-cfg-default-debug-level attribute in File-Based Debug Logger
+INFO_UPGRADE_TASK_10329_1_SUMMARY_10025=Updating ds-cfg-default-severity attribute in File-Based Error Logger
+INFO_UPGRADE_TASK_10339_1_SUMMARY_10026=Updating ds-cfg-override-severity attribute in Replication Repair Logger
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
index 136f5a1..350dd50 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java
@@ -315,6 +315,40 @@
register("2.7.0.10215",
copySchemaFile("03-pwpolicyextension.ldif"));
+ register("3.0.0.10214",
+ modifyConfigEntry(INFO_UPGRADE_TASK_10214_1_SUMMARY.get(),
+ "(ds-cfg-java-class=org.opends.server.loggers.debug.TextDebugLogPublisher)",
+ "delete:ds-cfg-java-class",
+ "-",
+ "add:ds-cfg-java-class",
+ "ds-cfg-java-class: org.opends.server.loggers.TextDebugLogPublisher"));
+
+ register("3.0.0.10232",
+ modifyConfigEntry(INFO_UPGRADE_TASK_10232_1_SUMMARY.get(),
+ "(objectclass=ds-cfg-file-based-debug-log-publisher)",
+ "delete:ds-cfg-default-debug-level"));
+
+ register("3.0.0.10329",
+ modifyConfigEntry(INFO_UPGRADE_TASK_10329_1_SUMMARY.get(),
+ "&(objectclass=ds-cfg-file-based-error-log-publisher)(cn=File-Based Error Logger)",
+ "delete:ds-cfg-default-severity",
+ "ds-cfg-default-severity: severe-warning",
+ "ds-cfg-default-severity: severe-error",
+ "ds-cfg-default-severity: fatal-error",
+ "-",
+ "add:ds-cfg-default-severity",
+ "ds-cfg-default-severity: error",
+ "ds-cfg-default-severity: warning"
+ ));
+
+ register("3.0.0.10339",
+ modifyConfigEntry(INFO_UPGRADE_TASK_10339_1_SUMMARY.get(),
+ "&(objectclass=ds-cfg-file-based-error-log-publisher)(cn=Replication Repair Logger)",
+ "delete:ds-cfg-override-severity",
+ "-",
+ "add:ds-cfg-override-severity",
+ "ds-cfg-override-severity: SYNC=INFO,ERROR,WARNING,NOTICE"));
+
/*
* All upgrades will refresh the server configuration schema and generate
* a new upgrade folder.
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
index 309ae3e..8a16a96 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
@@ -401,16 +401,16 @@
{
case TITLE_CALLBACK:
println(Style.TITLE, LocalizableMessage.raw(fnc.getMessage()), 0);
- logger.debug(LocalizableMessage.raw(fnc.getMessage()));
+ logger.info(LocalizableMessage.raw(fnc.getMessage()));
break;
case SUBTITLE_CALLBACK:
println(Style.SUBTITLE, LocalizableMessage.raw(fnc.getMessage()),
4);
- logger.debug(LocalizableMessage.raw(fnc.getMessage()));
+ logger.info(LocalizableMessage.raw(fnc.getMessage()));
break;
case NOTICE_CALLBACK:
println(Style.NOTICE, LocalizableMessage.raw(fnc.getMessage()), 1);
- logger.debug(LocalizableMessage.raw(fnc.getMessage()));
+ logger.info(LocalizableMessage.raw(fnc.getMessage()));
break;
case ERROR_CALLBACK:
println(Style.ERROR, LocalizableMessage.raw(fnc.getMessage()), 1);
--
Gitblit v1.10.0