Fix for OPENDJ-1352 upgrade.log does not contain platform line breaks - Rep...

Violette Roche-Montane

24.03.2014 6153683bd58a028a6bf3d0824f76b230ed075788

Fix for OPENDJ-1352 upgrade.log does not contain platform line breaks
- Replaced harcoded "\n" by com.forgerock.opendj.cli.Utils.LINE_SEPARATOR;

 opendj3-server-dev/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 com.forgerock.opendj.cli.Utils.LINE_SEPARATOR;

import java.io.File;
import java.io.FileWriter;
@@ -667,7 +668,7 @@
    {
      if (LicenseFile.exists())
      {
        context.notify(LocalizableMessage.raw("\n" + LicenseFile.getText()));
        context.notify(LocalizableMessage.raw(LINE_SEPARATOR + LicenseFile.getText()));
        context.notify(INFO_LICENSE_DETAILS_CLI_LABEL.get());
        if (!context.isAcceptLicenseMode())
        {

 opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeLog.java

@@ -44,6 +44,7 @@
import com.forgerock.opendj.cli.ReturnCode;

import static org.opends.messages.ToolMessages.ERR_UPGRADE_INVALID_LOG_FILE;
import static com.forgerock.opendj.cli.Utils.LINE_SEPARATOR;

/**
 * Creates a historical log about the upgrade. If file does not exist an attempt
@@ -94,9 +95,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(LINE_SEPARATOR);
        sb.append(SPACE).append("msg=").append(record.getMessage())
            .append("\n");
            .append(LINE_SEPARATOR);
        return sb.toString();
      }
    });