From 493ef6283b84aae15f4642299df3e0ddee56fcd9 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 08 May 2007 09:55:44 +0000
Subject: [PATCH] Remove explicit references to some classes in the org.opends.server package which broke the QuickSetup (the user had to wait till OpenDS.jar was downloaded). Also modify the code to have a localized message when the server is failed to start in the connection handlers mode.
---
opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java | 16 +++++-----------
opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties | 2 ++
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties b/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
index 6119838..1e3fa06 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
+++ b/opends/src/quicksetup/org/opends/quicksetup/resources/Resources.properties
@@ -871,6 +871,8 @@
error-importing-ldif=Error Importing LDIF File.
error-import-automatically-generated=Error Importing Automatically- Generated \
Data when invoked with arguments: {0}".
+error-starting-server-with-no-connection-handlers=Error Starting Server with \
+no connection handlers: {0}.
error-starting-server=Error Starting Directory Server.
error-starting-server-in-windows=Could not connect to Server after Start. \
If you have a firewall configured check that it allows connections to port {0}.
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java b/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java
index 09e74db..1411d3d 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java
@@ -479,18 +479,12 @@
LOG.log(Level.INFO, msg, e);
throw new ApplicationException(ApplicationException.Type.IMPORT_ERROR,
msg, e);
- } catch (org.opends.server.types.InitializationException e) {
- String msg = "Failed to start server due to initialization error:" +
- e.getLocalizedMessage();
- LOG.log(Level.INFO, msg, e);
+ } catch (Throwable t) {
+ String msg = getMsg("error-starting-server-with-no-connection-handlers",
+ (t.getMessage() == null) ? t.toString() : t.getMessage());
+ LOG.log(Level.INFO, msg, t);
throw new ApplicationException(ApplicationException.Type.IMPORT_ERROR,
- msg, e);
- } catch (org.opends.server.config.ConfigException e) {
- String msg = "Failed to start server due to configuration error: " +
- e.getLocalizedMessage();
- LOG.log(Level.INFO, msg, e);
- throw new ApplicationException(ApplicationException.Type.IMPORT_ERROR,
- msg, e);
+ msg, t);
}
}
--
Gitblit v1.10.0