Fix for issue 1376.

jvergara

15.11.2007 0aa52784ef40ea92491ddd8785a2e2b97ade643f

Fix for issue 1376.

With the addition of AspectJ there are some added dependencies in the code.  So
for instance using the class StaticUtils requires je.jar to be on the path
(which was not the case before).  The uninstall scripts used to have a limited
set of jar files so that afterwards there was a minimum number of files to be
deleted.  Instead of doing this uninstall scripts should use the full class path.

In any case all the remaning files are under the same directory so the user will
have to do the cleanup in the same single place as before.

 opends/resource/uninstall

@@ -115,9 +115,6 @@
  fi
fi

# Configure the appropriate CLASSPATH to run uninstall.
CLASSPATH=${INSTANCE_ROOT}/lib/quicksetup.jar:${INSTANCE_ROOT}/lib/OpenDS.jar
export CLASSPATH

# Launch the uninstall process.
"${JAVA_BIN}" org.opends.quicksetup.uninstaller.UninstallLauncher "${@}"

 opends/resource/uninstall.bat

@@ -52,8 +52,7 @@
goto end

:setClassPath
call "%DIR_HOME%\bin\setcp.bat" %DIR_HOME%\lib\quicksetup.jar
call "%DIR_HOME%\bin\setcp.bat" %DIR_HOME%\lib\OpenDS.jar
FOR %%x in ("%DIR_HOME%\lib\*.jar") DO call "%DIR_HOME%\bin\setcp.bat" %%x

set PATH=%SystemRoot%


 opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java

@@ -163,8 +163,7 @@
    {
      if (userData.getRemoveLibrariesAndTools())
      {
        String[] arg = {getTab()+getQuicksetupJarPath()+
            getLineBreak()+getTab()+getOpenDSJarPath()};
        String[] arg = {getLibrariesPath()};
        successMsg = getMsg(
            "summary-uninstall-finished-successfully-remove-jarfiles-cli",
            arg);
@@ -178,8 +177,7 @@
    {
      if (userData.getRemoveLibrariesAndTools())
      {
        String[] arg = {getTab()+getQuicksetupJarPath()+
            getLineBreak()+getTab()+getOpenDSJarPath()};
        String[] arg = {getLibrariesPath()};
        successMsg = getMsg(
            "summary-uninstall-finished-successfully-remove-jarfiles", arg);
      }
@@ -884,24 +882,6 @@
  }

  /**
   * Returns the path to the quicksetup jar file.
   * @return the path to the quicksetup jar file.
   */
  private String getQuicksetupJarPath()
  {
    return Utils.getPath(getLibrariesPath(), "quicksetup.jar");
  }

  /**
   * Returns the path to the open ds jar file.
   * @return the path to the open ds jar file.
   */
  private String getOpenDSJarPath()
  {
    return Utils.getPath(getLibrariesPath(), "OpenDS.jar");
  }

  /**
   * Returns the path to the backup files under the install path.
   * @return the path to the backup files under the install path.
   */
@@ -1162,8 +1142,6 @@
   */
  class InstallationFilesToDeleteFilter implements FileFilter
  {
    File quicksetupFile = new File(getQuicksetupJarPath());
    File openDSFile = new File(getOpenDSJarPath());
    File librariesFile = new File(getLibrariesPath());

    File installationPath = new File(Utils.getInstallPathFromClasspath());
@@ -1193,10 +1171,8 @@
      };

     boolean accept =
          !installationPath.equals(file)
              && !librariesFile.equals(file)
              && !quicksetupFile.equals(file)
              && !openDSFile.equals(file);
          !installationPath.equals(file)&&
          !equalsOrDescendant(file, librariesFile);

     for (int i=0; i<uData.length && accept; i++)
     {