mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Ludovic Poitou
01.12.2011 e01ad71d761c65c94cd8531763c914c07927ea60
Fix issue OPENDJ-207, to avoid triggering X11 server when using setup --cli mode.
3 files modified
19 ■■■■■ changed files
opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java 7 ●●●● patch | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java 6 ●●●● patch | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java 6 ●●●● patch | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -2240,13 +2240,16 @@
   * @param hmSummary the Map containing the messages.
   */
  protected void updateSummaryWithServerState(
      Map<InstallProgressStep, Message> hmSummary)
      Map<InstallProgressStep, Message> hmSummary, Boolean isCli)
  {
   Installation installation = getInstallation();
   String cmd = getPath(installation.getControlPanelCommandFile());
   cmd = Utils.addWordBreaks(
   if (! isCli)
   {
     cmd = Utils.addWordBreaks(
       UIFactory.applyFontToHtml(cmd, UIFactory.INSTRUCTIONS_MONOSPACE_FONT),
       60, 5);
   }
   Message status;
   if (installation.getStatus().isServerRunning())
   {
opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
@@ -223,7 +223,7 @@
      }
      checkAbort();
      updateSummaryWithServerState(hmSummary);
      updateSummaryWithServerState(hmSummary, true);
      setCurrentProgressStep(InstallProgressStep.FINISHED_SUCCESSFULLY);
      notifyListeners(null);
@@ -254,7 +254,7 @@
          }
        }
        notifyListeners(getLineBreak());
        updateSummaryWithServerState(hmSummary);
        updateSummaryWithServerState(hmSummary, true);
        setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
        Message html = getFormattedError(ex, true);
        notifyListeners(html);
@@ -285,7 +285,7 @@
        }
      }
      notifyListeners(getLineBreak());
      updateSummaryWithServerState(hmSummary);
      updateSummaryWithServerState(hmSummary, true);
      setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
      ApplicationException ex = new ApplicationException(
          ReturnCode.BUG,
opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -265,7 +265,7 @@
      }
      checkAbort();
      updateSummaryWithServerState(hmSummary);
      updateSummaryWithServerState(hmSummary, false);
      setCurrentProgressStep(InstallProgressStep.FINISHED_SUCCESSFULLY);
      notifyListeners(null);
@@ -296,7 +296,7 @@
          }
        }
        notifyListeners(getLineBreak());
        updateSummaryWithServerState(hmSummary);
        updateSummaryWithServerState(hmSummary, false);
        setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
        Message html = getFormattedError(ex, true);
        notifyListeners(html);
@@ -317,7 +317,7 @@
        }
      }
      notifyListeners(getLineBreak());
      updateSummaryWithServerState(hmSummary);
      updateSummaryWithServerState(hmSummary, false);
      setCurrentProgressStep(InstallProgressStep.FINISHED_WITH_ERROR);
      ApplicationException ex = new ApplicationException(
          ReturnCode.BUG,