OPENDJ-2773 Fix upgrade

Gaetan Boismal

24.43.2016 356fb0aa8e4afbc8615a29b48082340905781268

 opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/UpgradeTasks.java

@@ -1337,11 +1337,7 @@
      {
        for (final String jarFileName : jarFileNames)
        {
          final File f = new File(libDirectory, jarFileName + ".jar");
          if (f.exists())
          {
            f.delete();
          }
          deleteFileIfExists(new File(libDirectory, jarFileName + ".jar"));
        }
      }

@@ -1516,6 +1512,20 @@
    };
  }

  static UpgradeTask removeTools(final String... toolNames)
  {
    return new AbstractUpgradeTask() {
      @Override
      public void perform(final UpgradeContext context) throws ClientException {
        for (final String toolName : toolNames)
        {
          deleteFileIfExists(new File(binDirectory, toolName));
          deleteFileIfExists(new File(batDirectory, toolName +  ".bat"));
        }
      }
    };
  }

  /** Prevent instantiation. */
  private UpgradeTasks()
  {