Fix a bug in the java properties tools that broke the script because of a m...

jvergara

03.25.2008 6184df3d1062cf8b064b448fe21128ac13754bdc

Fix a bug in the java properties tools that broke the script because of a missing line break.
Improve the indentation of the resulting set-java-home file generated by dsjavaproperties.
Do not use JAVA_ARGS in lib/set-java-properties.
Make the setup not to overwrite the environment variables by default.

 opends/resource/bin/_script-util.bat

@@ -77,7 +77,6 @@
goto scriptBegin

:checkEnvJavaArgs
if "%OPENDS_JAVA_ARGS%"=="" set OPENDS_JAVA_ARGS=%JAVA_ARGS%
if "%OPENDS_JAVA_BIN%" == "" goto checkOpenDSJavaHome
if not exist "%OPENDS_JAVA_BIN%" goto checkOpenDSJavaHome
goto endJavaHomeAndArgs

 opends/src/quicksetup/org/opends/quicksetup/installer/InstallerHelper.java

@@ -716,9 +716,9 @@
    if (!propertiesFileModified)
    {
      writer.newLine();
      writer.write("overwrite-env-java-home=true");
      writer.write("overwrite-env-java-home=false");
      writer.newLine();
      writer.write("overwrite-env-java-args=true");
      writer.write("overwrite-env-java-args=false");
      writer.newLine();
      writer.newLine();
      writer.write("default.java-home="+javaHome);

 opends/src/server/org/opends/server/tools/JavaPropertiesTool.java

@@ -479,16 +479,23 @@
          String s;
          if (nIfs > 0)
          {
            if (!overwriteJavaHome)
            {
              s = "    ";
            }
            else
            {
              s = "";
            }
            buf.append(
                "  elif test \"${SCRIPT_NAME}.java-home\" = \""+name+"\""+EOL);
            s = "    ";
                s+"elif test \"${SCRIPT_NAME}.java-home\" = \""+name+"\""+EOL);
          }
          else if (!overwriteJavaHome)
          {
            buf.append(
                "  then"+EOL+
                "    if test \"${SCRIPT_NAME}.java-home\" = \""+name+"\""+EOL);
            s = "      ";
            s = "    ";
          }
          else
          {
@@ -516,7 +523,7 @@
        String s;
        if (!overwriteJavaHome)
        {
          s = "  ";
          s = "    ";
        }
        else
        {
@@ -555,7 +562,7 @@
      String s;
      if (!overwriteJavaHome)
      {
        s = "  ";
        s = "    ";
      }
      else
      {
@@ -580,7 +587,7 @@
          "    OPENDS_JAVA_BIN=${OPENDS_JAVA_HOME}/bin/java"+EOL+
          "    export OPENDS_JAVA_BIN"+EOL+
          "  fi"+EOL+
          "fi");
          "fi"+EOL+EOL);
    }
    else if (defaultJavaHome == null)
    {
@@ -636,7 +643,7 @@
          "    OPENDS_JAVA_BIN=\"${OPENDS_JAVA_HOME}/bin/java\""+EOL+
          "    export OPENDS_JAVA_BIN"+EOL+
          "  fi"+EOL+
          "fi"+EOL);
          "fi"+EOL+EOL);
    }


@@ -645,9 +652,7 @@
      buf.append(
          EOL+
          "# See if the environment variables for arguments are set."+EOL+
          "if test -z \"${OPENDS_JAVA_ARGS}\""+EOL+
          "then"+EOL+
          "  if test -z \"${JAVA_ARGS}\""+EOL);
          "if test -z \"${OPENDS_JAVA_ARGS}\""+EOL);
    }

    propertiesAdded = false;
@@ -659,7 +664,7 @@
      String name = propertyNames.nextElement().toString();
      String value = properties.getProperty(name);

      String s = overwriteJavaArgs? "":"    ";
      String s = overwriteJavaArgs? "":"  ";

      if (value != null)
      {
@@ -681,8 +686,8 @@
          else if (!overwriteJavaArgs)
          {
            buf.append(
                "  then"+EOL+
                "    if test \"${SCRIPT_NAME}.java-args\" = \""+name+"\""+EOL);
                "then"+EOL+
                "  if test \"${SCRIPT_NAME}.java-args\" = \""+name+"\""+EOL);
          }
          else
          {
@@ -699,7 +704,7 @@
    }
    if (defaultJavaArgs != null)
    {
      String s = overwriteJavaArgs? "":"    ";
      String s = overwriteJavaArgs? "":"  ";
      if (propertiesAdded)
      {
        buf.append(
@@ -728,7 +733,7 @@
    }
    if (nIfs > 0)
    {
      String s = overwriteJavaArgs? "":"    ";
      String s = overwriteJavaArgs? "":"  ";
      buf.append(s+"fi"+EOL);
    }

@@ -738,14 +743,10 @@
      {
        // No properties added: this is required not to break the script
        buf.append(
            "    then"+EOL+
            "    OPENDS_JAVA_ARGS=${OPENDS_JAVA_ARGS}"+EOL);
            "  then"+EOL+
            "  OPENDS_JAVA_ARGS=${OPENDS_JAVA_ARGS}"+EOL);
      }
      buf.append(
          "  else"+EOL+
          "    OPENDS_JAVA_ARGS=${JAVA_ARGS}"+EOL+
          "    export OPENDS_JAVA_ARGS"+EOL+
          "  fi"+EOL+
          "fi"+EOL);
    }

@@ -927,8 +928,6 @@
    else
    {
      buf.append(
          "if NOT \"%OPENDS_JAVA_ARGS%\" == \"\" goto end"+EOL+
          "set OPENDS_JAVA_ARGS=%JAVA_ARGS%"+EOL+
          "goto end"+EOL+EOL);
    }