From 93ba67975e33b76fb0770377b61b2dedccd5a5cd Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 24 Feb 2014 16:35:42 +0000
Subject: [PATCH] OPENDJ-1352 upgrade.log does not contain platform line breaks - Replaced harcoded "\n" by ServerConstants.EOL.
---
opends/src/server/org/opends/server/tools/upgrade/UpgradeLog.java | 7 ++++---
opends/src/server/org/opends/server/tools/upgrade/Upgrade.java | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java b/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java
index ea963e3..03dbafa 100644
--- a/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java
@@ -30,6 +30,7 @@
import static org.opends.server.tools.upgrade.FormattedNotificationCallback.*;
import static org.opends.server.tools.upgrade.UpgradeTasks.*;
import static org.opends.server.tools.upgrade.LicenseFile.*;
+import static org.opends.server.util.ServerConstants.EOL;
import java.io.File;
import java.io.FileWriter;
@@ -632,7 +633,7 @@
{
if (LicenseFile.exists())
{
- context.notify(Message.raw("\n" + LicenseFile.getText()));
+ context.notify(Message.raw(EOL + LicenseFile.getText()));
context.notify(INFO_LICENSE_DETAILS_CLI_LABEL.get());
if (!context.isAcceptLicenseMode())
{
diff --git a/opends/src/server/org/opends/server/tools/upgrade/UpgradeLog.java b/opends/src/server/org/opends/server/tools/upgrade/UpgradeLog.java
index 12cd2c8..e4d8bef 100644
--- a/opends/src/server/org/opends/server/tools/upgrade/UpgradeLog.java
+++ b/opends/src/server/org/opends/server/tools/upgrade/UpgradeLog.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2013 ForgeRock AS
+ * Copyright 2013-2014 ForgeRock AS
*/
package org.opends.server.tools.upgrade;
@@ -42,6 +42,7 @@
import org.opends.server.tools.ClientException;
import static org.opends.messages.ToolMessages.ERR_UPGRADE_INVALID_LOG_FILE;
+import static org.opends.server.util.ServerConstants.EOL;
/**
* Creates a historical log about the upgrade. If file does not exist an attempt
@@ -92,9 +93,9 @@
record.getSequenceNumber()).append(SPACE).append("severity=")
.append(record.getLevel().toString().toUpperCase());
sb.append(SPACE).append("src=").append(record.getSourceClassName())
- .append(SPACE).append(record.getSourceMethodName()).append("\n");
+ .append(SPACE).append(record.getSourceMethodName()).append(EOL);
sb.append(SPACE).append("msg=").append(record.getMessage())
- .append("\n");
+ .append(EOL);
return sb.toString();
}
});
--
Gitblit v1.10.0