From 55ed5b4483e8b64675979d28be21052727421778 Mon Sep 17 00:00:00 2001 From: unknown Date: Mar 31 2009 17:43:16 +0000 Subject: This commit was manufactured by cvs2git to create tag 'FedoraAdmservconsole112_20080116'. --- diff --git a/build.properties b/build.properties index 3f9c6b6..28f9738 100755 --- a/build.properties +++ b/build.properties @@ -21,7 +21,7 @@ lang=en admservconsole.root=.. -admservconsole.version=1.1.3 +admservconsole.version=1.1.1 admservconsole.gen.version=1.1 brand=fedora admservconsole.name=${brand}-admin-${admservconsole.version} diff --git a/fedora-ds-admin-console.spec b/fedora-ds-admin-console.spec index 9b07745..df8678b 100755 --- a/fedora-ds-admin-console.spec +++ b/fedora-ds-admin-console.spec @@ -1,5 +1,5 @@ %define major_version 1.1 -%define minor_version 3 +%define minor_version 1 %define dsname fedora-ds %define shortname fedora-admin @@ -7,7 +7,7 @@ Name: fedora-ds-admin-console Version: %{major_version}.%{minor_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fedora Admin Server Management Console Group: Applications/System @@ -18,10 +18,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2 Requires: %{dsname}-admin +Requires: java-1.7.0-icedtea BuildRequires: ant >= 1.6.2 BuildRequires: ldapjdk BuildRequires: idm-console-framework -BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: java-1.7.0-icedtea-devel Obsoletes: fedora-admin-console %description @@ -71,12 +72,6 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/%{pkgname}/manual/en/admin/help/*.html %changelog -* Tue Mar 31 2009 Rich Megginson 1.1.3-1 -- this is the 1.1.3 release - -* Thu Jul 3 2008 Rich Megginson 1.1.2-1 -- disable SSLv2 settings - * Wed Jan 16 2008 Rich Megginson 1.1.1-2 - rename package to fedora-ds-admin-console diff --git a/help/en/help/administration_express_server_information.html b/help/en/help/administration_express_server_information.html index 582e8b4..83ed84e 100644 --- a/help/en/help/administration_express_server_information.html +++ b/help/en/help/administration_express_server_information.html @@ -12,6 +12,9 @@ Administration Express - Server Information Installation Date. The date and time when the server was installed.

+Server Root. The directory where the server binary files are installed. +

+

Port. The port number the server is running on.

diff --git a/src/com/netscape/management/admserv/AdminServerProduct.java b/src/com/netscape/management/admserv/AdminServerProduct.java index 6cad7d4..57f22a3 100644 --- a/src/com/netscape/management/admserv/AdminServerProduct.java +++ b/src/com/netscape/management/admserv/AdminServerProduct.java @@ -100,7 +100,7 @@ public class AdminServerProduct implements IProductObject { * existing SIE. Also, since the admin server that is being invoked * to do the migration via URL belongs to the target config root, * the targetDN is also unused. Moreover, the server parameter is not - * needed since there can only be one admin server per machine. + * needed since there can only be one admin server per server root. * * @param serverRoot - directory path for the migration origin. * @param server - the server to migrate from the serverRoot. diff --git a/src/com/netscape/management/admserv/admserv.properties b/src/com/netscape/management/admserv/admserv.properties index 0671f19..7926db2 100644 --- a/src/com/netscape/management/admserv/admserv.properties +++ b/src/com/netscape/management/admserv/admserv.properties @@ -136,7 +136,6 @@ log-host=Host log-username=Username log-date=Date log-time=Time -log-datetime=Date&Time log-header=Header log-errorcode=HTTP Code log-length=Length diff --git a/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java b/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java index 588e514..b9bc0cc 100644 --- a/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java +++ b/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java @@ -172,24 +172,14 @@ class AccessDataCommClient extends AbstractCommClient { int bufferLength = buffer.length(); int state = STATE_HOST; char character; - char charNMinus1 = 0; - char charNMinus2 = 0; for (int index = 0; index < bufferLength; index++) { character = buffer.charAt(index); - if (index > 0) { - charNMinus1 = buffer.charAt(index-1); - } - if (index > 1) { - charNMinus2 = buffer.charAt(index-2); - } switch (state) { case STATE_HOST: - if ((character == ' ') && (charNMinus1 == '-') && - (charNMinus2 == ' ')) { + if (character == '-') state = STATE_USERNAME; - } - else if ((character != ' ') && (charNMinus1 != ' ')) + else if (character != ' ') data.host.append(character); break; diff --git a/src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java b/src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java index d080005..5d88752 100644 --- a/src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java +++ b/src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java @@ -50,7 +50,8 @@ public class ErrorLogViewerModel extends LogViewerModel { _password = _consoleInfo.getAuthenticationPassword(); addColumn(_resource.getString("log", "lineno")); - addColumn(_resource.getString("log", "datetime")); + addColumn(_resource.getString("log", "date")); + addColumn(_resource.getString("log", "time")); addColumn(_resource.getString("log", "severity")); addColumn(_resource.getString("log", "details")); @@ -125,9 +126,10 @@ public class ErrorLogViewerModel extends LogViewerModel { class ErrorLogDataClient extends AbstractCommClient { final int STATE_START = 0; - final int STATE_DATETIME = 1; - final int STATE_SEVERITY = 2; - final int STATE_DETAIL = 3; + final int STATE_DATE = 1; + final int STATE_TIME = 2; + final int STATE_SEVERITY = 3; + final int STATE_DETAIL = 4; protected LogViewerModel _model; public ErrorLogDataClient(String username, String password) { @@ -135,7 +137,8 @@ public class ErrorLogViewerModel extends LogViewerModel { } class ErrorLogData { - StringBuffer datetime = new StringBuffer(); + StringBuffer date = new StringBuffer(); + StringBuffer time = new StringBuffer(); StringBuffer severity = new StringBuffer(); StringBuffer detail = new StringBuffer(); } @@ -153,20 +156,27 @@ public class ErrorLogViewerModel extends LogViewerModel { switch (state) { case STATE_START: if (character == '[') - state = STATE_DATETIME; + state = STATE_DATE; break; - case STATE_DATETIME: + case STATE_DATE: + if (character == ':') + state = STATE_TIME; + else + data.date.append(character); + break; + + case STATE_TIME: if (character == ']') state = STATE_SEVERITY; else - data.datetime.append(character); + data.time.append(character); break; case STATE_SEVERITY: - if (character == ']') + if (character == ':') state = STATE_DETAIL; - else if (character != '[') + else if (character != ' ') data.severity.append(character); break; @@ -197,9 +207,10 @@ public class ErrorLogViewerModel extends LogViewerModel { model.setValueAt( Integer.toString(rowOffset + rowIndex), rowIndex, 0); - model.setValueAt(d.datetime, rowIndex, 1); - model.setValueAt(d.severity, rowIndex, 2); - model.setValueAt(d.detail, rowIndex, 3); + model.setValueAt(d.date, rowIndex, 1); + model.setValueAt(d.time, rowIndex, 2); + model.setValueAt(d.severity, rowIndex, 3); + model.setValueAt(d.detail, rowIndex, 4); } else { break; } diff --git a/src/com/netscape/management/admserv/panel/TurnOnSSL.java b/src/com/netscape/management/admserv/panel/TurnOnSSL.java index 4bd972e..32a0c03 100644 --- a/src/com/netscape/management/admserv/panel/TurnOnSSL.java +++ b/src/com/netscape/management/admserv/panel/TurnOnSSL.java @@ -171,7 +171,7 @@ public class TurnOnSSL implements IPluginConfigPanel, EncryptionOptions, IClient _domestic = domestic; Object ssl2Setting = securitySettings.get("ssl2"); - Object ssl3Setting = securitySettings.get("ssl3"); + Object ssl3Setting = securitySettings.get("ssl2"); Object tlsSetting = securitySettings.get("tls"); //construct a default cipher preference dialog, and get the default settings