From c40f084a6d3e897785f2fbff3ddb97545644cddc Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 11 Dec 2006 15:34:39 +0000
Subject: [PATCH] The following modifications include the comments from Neil and Brian (thanks to both for your help):
---
opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java | 49 +++++++++++++++++++++----------------------------
1 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java b/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
index 061f795..8efd4f1 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -43,7 +43,6 @@
import org.opends.quicksetup.installer.UserInstallData;
import org.opends.quicksetup.util.ProgressMessageFormatter;
import org.opends.quicksetup.util.Utils;
-import org.opends.server.util.SetupUtils;
/**
* This is an implementation of the Installer class that is used to install
@@ -58,7 +57,7 @@
* we require all the jar files to be downloaded in order to install and
* configure the Directory Server.
*
- * Based on the Java properties set through the OpenDSQuickSetup.jnlp file this
+ * Based on the Java properties set through the QuickSetup.jnlp file this
* class will retrieve the zip file containing the install, unzip it and extract
* it in the path specified by the user and that is contained in the
* UserInstallData object.
@@ -125,7 +124,7 @@
}
/**
- * Actually performs the start in this thread. The thread is blocked.
+ * Actually performs the install in this thread. The thread is blocked.
*
*/
private void doInstall()
@@ -170,12 +169,7 @@
break;
}
- try
- {
- // This isn't likely to happen, and it's not a serious problem even if
- // it does.
- SetupUtils.writeSetJavaHome(getUserData().getServerLocation());
- } catch (Exception e) {}
+ writeJavaHome();
if (getUserData().getStartServer())
{
@@ -193,6 +187,14 @@
String html = getFormattedError(ex, true);
notifyListeners(html);
}
+ catch (Throwable t)
+ {
+ status = InstallProgressStep.FINISHED_WITH_ERROR;
+ InstallException ex = new InstallException(
+ InstallException.Type.BUG, getThrowableMsg("bug-msg", t), t);
+ String msg = getFormattedError(ex, true);
+ notifyListeners(msg);
+ }
}
/**
@@ -424,7 +426,7 @@
{
String[] arg =
{ entry.getName() };
- String errorMsg = getExceptionMsg("error-copying", arg, ioe);
+ String errorMsg = getThrowableMsg("error-copying", arg, ioe);
throw new InstallException(InstallException.Type.FILE_SYSTEM_ERROR,
errorMsg, ioe);
@@ -465,7 +467,7 @@
{
String[] arg =
{ getZipFileName() };
- String errorMsg = getExceptionMsg("error-zip-stream", arg, ioe);
+ String errorMsg = getThrowableMsg("error-zip-stream", arg, ioe);
throw new InstallException(InstallException.Type.FILE_SYSTEM_ERROR,
errorMsg, ioe);
}
@@ -565,11 +567,11 @@
*/
private String[] getOpenDSJarPaths()
{
- String[] jarPaths = new String[OPEN_DS_JAR_RELATIVE_PATHS.length];
+ String[] jarPaths = new String[Utils.getOpenDSJarPaths().length];
File parentDir = new File(getUserData().getServerLocation());
for (int i = 0; i < jarPaths.length; i++)
{
- File f = new File(parentDir, OPEN_DS_JAR_RELATIVE_PATHS[i]);
+ File f = new File(parentDir, Utils.getOpenDSJarPaths()[i]);
jarPaths[i] = f.getAbsolutePath();
}
return jarPaths;
@@ -619,6 +621,9 @@
} else if (path.endsWith(".sh"))
{
perm = "755";
+ } else if (path.endsWith("setup") || path.endsWith("uninstall"))
+ {
+ perm = "755";
} else
{
perm = "644";
@@ -640,20 +645,8 @@
/**
* {@inheritDoc}
*/
- protected String getConfigFilePath()
+ protected String getInstallationPath()
{
- String fullInstallPath = getUserData().getServerLocation();
-
- return Utils.getPath(fullInstallPath, CONFIG_PATH_RELATIVE);
+ return getUserData().getServerLocation();
}
-
- /**
- * {@inheritDoc}
- */
- protected String getBinariesPath()
- {
- String fullInstallPath = getUserData().getServerLocation();
-
- return Utils.getPath(fullInstallPath, BINARIES_PATH_RELATIVE);
- }
-}
+}
\ No newline at end of file
--
Gitblit v1.10.0