From f78f30fcdb950229230b799a3b3e46a5ad26b3d7 Mon Sep 17 00:00:00 2001 From: unknown Date: Mar 31 2009 17:43:04 +0000 Subject: This commit was manufactured by cvs2git to create tag 'Directory_Server_8_0_Beta_20071106_3'. --- diff --git a/build.properties b/build.properties index 3f9c6b6..ff2cf71 100755 --- a/build.properties +++ b/build.properties @@ -21,7 +21,7 @@ lang=en admservconsole.root=.. -admservconsole.version=1.1.3 +admservconsole.version=1.1.0 admservconsole.gen.version=1.1 brand=fedora admservconsole.name=${brand}-admin-${admservconsole.version} diff --git a/fedora-admin-console.spec b/fedora-admin-console.spec new file mode 100755 index 0000000..e580f19 --- /dev/null +++ b/fedora-admin-console.spec @@ -0,0 +1,74 @@ +%define major_version 1.1 +%define minor_version 0 + +%define dsname fedora-ds +%define shortname fedora-admin + +Name: fedora-admin-console +Version: %{major_version}.%{minor_version} +Release: 2 +Summary: Fedora Admin Server Management Console + +Group: Applications +License: LGPL +URL: http://directory.fedoraproject.org + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch +Source: %{name}-%{version}.tar.bz2 +Requires: %{dsname}-admin >= 1.1 +BuildRequires: ant >= 1.6.2 +BuildRequires: ldapjdk +BuildRequires: idm-console-framework >= 1.1 + +%description +A Java based remote management console used for Managing Fedora +Admin Server. + +%prep +%setup -q + +%build +%{ant} \ + -Dconsole.location=%{_javadir} \ + -Dbuilt.dir=`pwd`/built + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{_datadir}/%{dsname}/html/java +install -m777 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{dsname}/html/java +install -d $RPM_BUILD_ROOT%{_datadir}/%{dsname}/manual/en/admin/help +install -m644 help/en/*.html $RPM_BUILD_ROOT%{_datadir}/%{dsname}/manual/en/admin +install -m644 help/en/tokens.map $RPM_BUILD_ROOT%{_datadir}/%{dsname}/manual/en/admin +install -m644 help/en/help/*.html $RPM_BUILD_ROOT%{_datadir}/%{dsname}/manual/en/admin/help + +# create symlinks +pushd $RPM_BUILD_ROOT%{_datadir}/%{dsname}/html/java +ln -s %{shortname}-%{version}.jar %{shortname}-%{major_version}.jar +ln -s %{shortname}-%{version}.jar %{shortname}.jar +ln -s %{shortname}-%{version}_en.jar %{shortname}-%{major_version}_en.jar +ln -s %{shortname}-%{version}_en.jar %{shortname}_en.jar +popd + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%{_datadir}/%{dsname}/html/java/%{shortname}-%{version}.jar +%{_datadir}/%{dsname}/html/java/%{shortname}-%{major_version}.jar +%{_datadir}/%{dsname}/html/java/%{shortname}.jar +%{_datadir}/%{dsname}/html/java/%{shortname}-%{version}_en.jar +%{_datadir}/%{dsname}/html/java/%{shortname}-%{major_version}_en.jar +%{_datadir}/%{dsname}/html/java/%{shortname}_en.jar +%dir %{_datadir}/%{dsname}/manual/en/admin +%{_datadir}/%{dsname}/manual/en/admin/tokens.map +%doc %{_datadir}/%{dsname}/manual/en/admin/*.html +%doc %{_datadir}/%{dsname}/manual/en/admin/help/*.html + +%changelog +* Wed Aug 8 2007 Nathan Kinder 1.1.0-2 +- Added online help files into package. + +* Thu Aug 2 2007 Nathan Kinder 1.1.0-1 +- Initial creation diff --git a/fedora-ds-admin-console.spec b/fedora-ds-admin-console.spec deleted file mode 100755 index 9b07745..0000000 --- a/fedora-ds-admin-console.spec +++ /dev/null @@ -1,98 +0,0 @@ -%define major_version 1.1 -%define minor_version 3 - -%define dsname fedora-ds -%define shortname fedora-admin -%define pkgname dirsrv - -Name: fedora-ds-admin-console -Version: %{major_version}.%{minor_version} -Release: 1%{?dist} -Summary: Fedora Admin Server Management Console - -Group: Applications/System -License: GPLv2 -URL: http://directory.fedoraproject.org - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -Source: http://directory.fedoraproject.org/sources/%{name}-%{version}.tar.bz2 -Requires: %{dsname}-admin -BuildRequires: ant >= 1.6.2 -BuildRequires: ldapjdk -BuildRequires: idm-console-framework -BuildRequires: java-devel >= 1:1.6.0 -Obsoletes: fedora-admin-console - -%description -A Java based remote management console used for Managing Fedora -Admin Server. - -%prep -%setup -q - -%build -%{ant} \ - -Dconsole.location=%{_javadir} \ - -Dbuilt.dir=`pwd`/built - -%install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java -install -m644 built/package/%{shortname}* $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java -install -d $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin/help -install -m644 help/en/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin -install -m644 help/en/tokens.map $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin -install -m644 help/en/help/*.html $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/manual/en/admin/help - -# create symlinks -pushd $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/html/java -ln -s %{shortname}-%{version}.jar %{shortname}-%{major_version}.jar -ln -s %{shortname}-%{version}.jar %{shortname}.jar -ln -s %{shortname}-%{version}_en.jar %{shortname}-%{major_version}_en.jar -ln -s %{shortname}-%{version}_en.jar %{shortname}_en.jar -popd - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%doc LICENSE -%{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}.jar -%{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}.jar -%{_datadir}/%{pkgname}/html/java/%{shortname}.jar -%{_datadir}/%{pkgname}/html/java/%{shortname}-%{version}_en.jar -%{_datadir}/%{pkgname}/html/java/%{shortname}-%{major_version}_en.jar -%{_datadir}/%{pkgname}/html/java/%{shortname}_en.jar -%dir %{_datadir}/%{pkgname}/manual/en/admin -%{_datadir}/%{pkgname}/manual/en/admin/tokens.map -%doc %{_datadir}/%{pkgname}/manual/en/admin/*.html -%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 - -* Thu Jan 10 2008 Rich Megginson 1.1.1-1 -- changes for fedora package review -- added requires for icedtea java -- added LICENSE - -* Wed Dec 19 2007 Rich Megginson - 1.1.0-4 -- This is for the Fedora DS 1.1 release - -* Thu Oct 25 2007 Rich Megginson - 1.1.0-3 -- updated sources - use dirsrv as package name - -* Wed Aug 8 2007 Nathan Kinder 1.1.0-2 -- Added online help files into package. - -* Thu Aug 2 2007 Nathan Kinder 1.1.0-1 -- Initial creation diff --git a/help/en/header.html b/help/en/header.html index f1ee44d..c7d0964 100644 --- a/help/en/header.html +++ b/help/en/header.html @@ -3,17 +3,18 @@ Fedora Management Console and Administration Server Help + *.text {font-size: 14px;} + + + Fedora Management Console and Administration Server Help
+
diff --git a/help/en/help/add_crl_ckl.html b/help/en/help/add_crl_ckl.html index 458fb7f..533ce63 100644 --- a/help/en/help/add_crl_ckl.html +++ b/help/en/help/add_crl_ckl.html @@ -6,7 +6,7 @@ Add CRL/CKL Use this dialog box to add a Certificate Revocation List (CRL) or a Compromised Key List (CKL) to the trust database.

-Enter CRL/CKL file. Provide the name of the file containing the CRL or CKL. This file must exist in the same directory as your key and cert database. +Enter full path to CRL/CKL file. Provide the full path to the file containing the CRL or CKL.

File contains a Certificate Revocation List (CRL). Select this option if the file contains a CRL. 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/help/en/help/certificate_information_detail.html b/help/en/help/certificate_information_detail.html index 904e7d3..08121ce 100644 --- a/help/en/help/certificate_information_detail.html +++ b/help/en/help/certificate_information_detail.html @@ -7,23 +7,7 @@ This panel lists detailed information about the selected certificate. This inclu

-Locality. If a locality was specified during the certificate request process, it is displayed here. -

- -

-Organization. If an organization was specified during the certificate request process, it is displayed here. -

- -

-Organization Unit. If an organization unit was specified during the certificate request process, it is displayed here. -

- -

-State. If a state was specified during the certificate request process, it is displayed here. -

- -

-Country. If a country was specified during the certificate request process, it is displayed here. +Organizational Unit. If an organizational unit was specified during the certificate request process, it is displayed here.

diff --git a/help/en/help/certificate_request_wizard_introduction.html b/help/en/help/certificate_request_wizard_introduction.html index fe0b1da..8dfcada 100644 --- a/help/en/help/certificate_request_wizard_introduction.html +++ b/help/en/help/certificate_request_wizard_introduction.html @@ -3,7 +3,7 @@ Certificate Request Wizard - Introduction

-You can use the Management Console to generate a manual or automatic certificate request. A manual request requires you to submit information to a CA. An automatic request is submitted for you by Console. In order to send an automatic request to a CA, you need to obtain a plug-in. For more information, contact your CA. +You can use Management Console to generate a manual or automatic certificate request. A manual request requires you to submit information to a CA. An automatic request is submitted for you by Console. In order to send an automatic request to a CA, you need to obtain a plug-in. For more information, contact your CA.

diff --git a/help/en/help/configure_administration_server_access.html b/help/en/help/configure_administration_server_access.html index e49534e..108657b 100644 --- a/help/en/help/configure_administration_server_access.html +++ b/help/en/help/configure_administration_server_access.html @@ -3,10 +3,13 @@ Configure Administration Server - Access

-Use this tab to specify a user name and password for the Administration Server Administrator. +Use this tab to specify a user name and password for the Administration Server Administrator and to enable or disable Directory Server Gateway access.

-The Administration Server Administrator is a special user that has full access to all features in the Administration Server. This user is created during installation. The Administration Server Administrator user name and password are stored in the file admpw in your Administration Server configuration directory. +The Administration Server Administrator is a special user that has full access to all features in the Administration Server. This user is created during installation for the purpose of starting Console if a Directory Server is unavailable. The Administration Server Administrator user name and password are stored in the file <server_root>/admin-serv/config/admpw. +

+

+The Directory Server Gateway is a service that provides web-based access to the entire user directory. The Directory Server Gateway must be installed before you can use this option.

User name. Enter the user ID for the Administration Server Administrator. diff --git a/help/en/help/configure_administration_server_configuration_ds.html b/help/en/help/configure_administration_server_configuration_ds.html index 538e117..9931931 100644 --- a/help/en/help/configure_administration_server_configuration_ds.html +++ b/help/en/help/configure_administration_server_configuration_ds.html @@ -15,5 +15,5 @@ All servers in an administration domain use the same configuration directory. If LDAP Port. Enter the port number for the configuration directory that this Administration Server uses.

-Secure Connection. Select this option if you would like the Administration Server to communicate with the configuration directory using SSL. +Secure Connection. Select this option if the configuration directory is already SSL enabled.

diff --git a/help/en/help/configure_administration_server_encryption.html b/help/en/help/configure_administration_server_encryption.html index ae84a0e..679f54f 100644 --- a/help/en/help/configure_administration_server_encryption.html +++ b/help/en/help/configure_administration_server_encryption.html @@ -9,7 +9,7 @@ Use this dialog box to enable Secure Sockets Layer (SSL) encryption. Enable SSL for this server. Select this option if you want to secure this server with Secure Sockets Layer (SSL) encryption. All other SSL encryption options listed here become available to you only when you enable SSL by checking this box.

-Use this cipher family. When you enable SSL encryption, the cipher families available to you are listed here. The internal security device supports only the RSA cipher family. +Use this cipher family. When you enable SSL encryption, the cipher families available to you are listed here. The Management Console currently supports two cipher families: RSA and Fortezza. The internal security device supports only RSA. If you're using a Fortezza card, you'll also see the Fortezza cipher family listed in the Encryption tab. Select the cipher families you want to use.

Security Device. Choose internal (software) if the key is stored in the local key database. All other choices on this list are available only if you are using an external module. diff --git a/help/en/help/configure_administration_server_network.html b/help/en/help/configure_administration_server_network.html index f79e863..9e45cc0 100644 --- a/help/en/help/configure_administration_server_network.html +++ b/help/en/help/configure_administration_server_network.html @@ -9,16 +9,16 @@ Use this panel to manage Administration Server network settings and to specify h Port. Enter the port number you want the Administration Server to use. The port number can be any number between 1 and 65535, but it is typically a random number greater than 1024.

-IP Address. Enter the IP address you want the server to use for incoming requests and connections. Leaving this field empty will cause the Administration Server to listen on all available network interfaces. +IP Address. Enter the IP address you want the server to use for incoming requests and connections.

-Connection Restrictions. Displays a list of hosts currently allowed to connect to the Administration Server. Use the drop-down list to indicate whether you're adding to the list by host name or by IP address. The list is evaluated first by host name and then by IP address. +Connection Restrictions. Displays a list of hosts currently allowed to connect to the Administration Server. Use the drop-down list to indicate whether you're adding to the list by DNS name or by IP address. The list is evaluated first by host name and then by IP address.

Add. Displays a dialog box for adding a host to the list of computers allowed to connect to the Administration Server.

-Edit. Displays a dialog box for editing a host name or IP address on the list of computers allowed to connect to the Administration Server. +Edit. Displays a dialog box for editing a Host IP address or DNS name on the list of computers allowed to connect to the Administration Server.

Remove. Removes a selected entry from the list of allowed hosts. diff --git a/help/en/help/configure_administration_server_user_ds.html b/help/en/help/configure_administration_server_user_ds.html index aa18f28..078a3a3 100644 --- a/help/en/help/configure_administration_server_user_ds.html +++ b/help/en/help/configure_administration_server_user_ds.html @@ -3,7 +3,7 @@ Configure Administration Server - User DS

-Use this screen to specify one or more Directory Servers to use when authenticating users to this Administration Server. +Use this screen to specify one or more Directory Servers to use when authenticating users.

Use Default User Directory. Choose this option if you want to use the user directory associated with the domain. Its LDAP URL is displayed here. @@ -41,6 +41,9 @@ If you specify multiple hosts in the LDAP Host and Port field, make sure they ar +
+
+

Secure Connection. Select this option if the new user directory is already SSL enabled.

diff --git a/help/en/help/create_user_administrator.html b/help/en/help/create_user_administrator.html index a7cdaf3..cb0cb90 100644 --- a/help/en/help/create_user_administrator.html +++ b/help/en/help/create_user_administrator.html @@ -32,3 +32,6 @@ Use this dialog box to enter or edit a user or administrator's information. The

Fax. (Optional) Enter the user or administrator's fax number.

+

+Access Permissions Help. Provides information on setting access controls that apply to users and groups. +

diff --git a/help/en/help/create_user_administrator_posix_user.html b/help/en/help/create_user_administrator_posix_user.html index 21c53f6..cd02116 100644 --- a/help/en/help/create_user_administrator_posix_user.html +++ b/help/en/help/create_user_administrator_posix_user.html @@ -9,13 +9,13 @@ Use this panel to store Posix/UNIX-specific user or administrator information in Enable Posix user attributes. Check this box to enable the fields in this panel.

-UID Number. Enter the user or administrator's UNIX ID number. +UID Number. (Optional) Enter the user or administrator's UNIX ID number.

-GID Number. Enter the user or administrator's UNIX group ID number. +GID Number. (Optional) Enter the user or administrator's UNIX group ID number.

-Home Directory. Enter the path to the user or administrator's home directory. For example, /u/jdoe. +Home Directory. (Optional) Enter the path to the user or administrator's home directory. For example, /u/jdoe.

Login Shell. (Optional) Enter the path to the user or administrator's login shell. For example, /usr/local/bin/tcsh. diff --git a/help/en/help/host_information.html b/help/en/help/host_information.html index 7c3143b..1d65cc5 100644 --- a/help/en/help/host_information.html +++ b/help/en/help/host_information.html @@ -12,10 +12,10 @@ Use this panel to view or edit host information. You can edit the following information about the selected host:

-Host name. Specifies the name of the host machine as displayed in the navigation tree. The host name is usually the fully qualified machine name, but any label is acceptable. For example, a host name could be westcoast.example.com or West Coast Server. +Host name. Specifies the name of the host machine as displayed in the navigation tree. The host name is usually the fully qualified machine name, but any label is acceptable. For example, a host name could be eastcoast.example.com or East Coast Sun ES10000.

-Description. (Optional) Contains a brief description of this host. For example, Server for the West Coast division of Example Corporation. +Description. (Optional) Contains a brief description of this host. For example, Sun ES10000 for the East Coast division of Example Corporation.

Location. (Optional) Specifies the physical location of this host. For example, Cube 17043 or Building 15 - Third Floor - Lab No. 1. @@ -24,8 +24,8 @@ You can edit the following information about the selected host: You can view, but not edit, the following information about the selected host:

-Platform. Indicates the host machine's architecture. For example, i686. +Platform. Indicates the host machine's architecture. For example, Intel.

-Operating system. Indicates the operating system that this host is running as reported by uname. For example, Linux westcoast.example.com 2.6.9-55.0.9.ELsmp Tue Sep 25 02:17:24 EDT i686 i686 i386 GNU/Linux. +Operating system. Indicates the operating system that this host is running. For example, Windows NT 4.0 (Build 1381).

diff --git a/help/en/help/list_crl_ckl.html b/help/en/help/list_crl_ckl.html deleted file mode 100644 index 96ad8dc..0000000 --- a/help/en/help/list_crl_ckl.html +++ /dev/null @@ -1,47 +0,0 @@ -

-Certificate Information - Detail -

- -

-General -

- -
    -

    -This panel lists detailed information about the selected certificate. -

    - -

    -Issuer. Lists the CA who issued each CRL or CKL. -

    - -

    -Signature algorithm. The mathematical formula used to sign the certificate. -

    - -

    -Version. The version number of the public key algorithm. -

    - -

    -Issuer DN. The full DN of the Certificate Authority (CA). -

    - -

    -Effective Date. Lists the date on which the CRL or CKL was issued. -

    - -

    -Next Update. Shows when an updated CRL or CKL will be available. -

    -
- -

-Revocation List -

- -
    -

    -This panel lists serial numbers and dates revoked by the CA. -

    -
diff --git a/help/en/help/logging_options.html b/help/en/help/logging_options.html index cf65370..f315703 100644 --- a/help/en/help/logging_options.html +++ b/help/en/help/logging_options.html @@ -3,13 +3,13 @@ Logging Options

-The Administration Server uses an access log and an error log. The access log monitors activity while the error log keeps track of server events and problems. Use this panel to indicate the filename to use for each of these log files. +The Administration Server uses an access log and an error log. The access log monitors activity while the error log keeps track of server events and problems. Use this panel to indicate where to store each of these log files.

-Access Log - Log File. Enter a filename for the access log. This must be a filename with no path provided. +Access Log - Log File. Enter a path and filename for the access log. This path can be absolute or relative to the server root. Example: /export/server_logs/access.

-Error Log - Log File. Enter a filename for the error log. This must be a filename with no path provided. +Error Log - Log File. Enter a path and filename for the error log. This path can be absolute or relative to the server root. Example: /export/server_logs/error.

diff --git a/help/en/help/manage_certificates_ca_certs.html b/help/en/help/manage_certificates_ca_certs.html index e71fe5d..f7004c9 100644 --- a/help/en/help/manage_certificates_ca_certs.html +++ b/help/en/help/manage_certificates_ca_certs.html @@ -3,7 +3,7 @@ Manage Certificates - CA Certs

-Use this dialog to view and manage Certificate Authority (CA) certificates. +Use this dialog to view, request, and manage Certificate Authority (CA) certificates.

Security Device. Choose the security device that you want to manage. Unless you have installed an external device, only internal (software) will be available. diff --git a/help/en/help/manage_certificates_revoked_certs.html b/help/en/help/manage_certificates_revoked_certs.html index ce78171..42dc8f0 100644 --- a/help/en/help/manage_certificates_revoked_certs.html +++ b/help/en/help/manage_certificates_revoked_certs.html @@ -3,7 +3,7 @@ Manage Certificates - Revoked Certs

-Use this dialog to view and manage Certificate Revocation Lists (CRLs) and Compromised Key Lists (CKLs). +Use this dialog to view, request, and manage Certificate Revocation Lists (CRLs) and Compromised Key Lists (CKLs).

diff --git a/help/en/help/search_users_and_groups_advanced.html b/help/en/help/search_users_and_groups_advanced.html index 0a3cce0..e51551a 100644 --- a/help/en/help/search_users_and_groups_advanced.html +++ b/help/en/help/search_users_and_groups_advanced.html @@ -74,5 +74,5 @@ The following operators are available: Search (button). Click to begin searching.

-By Filter (button). Click to use the search by filter. +Basic. Click to view fewer fields.

diff --git a/help/en/help/select_organizational_unit.html b/help/en/help/select_organizational_unit.html index 07cfc49..c8fe34f 100644 --- a/help/en/help/select_organizational_unit.html +++ b/help/en/help/select_organizational_unit.html @@ -7,5 +7,5 @@ Select the organizational unit in which to create the new user or group, then cl

-An organizational unit is a type of branch point in an LDAP directory. Typically, it is used to represent a major entity in your enterprise. This can be a real-life division such as Engineering or a logical grouping of directory entries such as People or Groups. In Distinguished Name (DN) syntax, an organizational unit is represented by ou. The Engineering division of a company might exist under ou=Engineering, dc=example, dc=com. Employees may be stored under ou=People, dc=example, dc=com. +An organizational unit is a type of branch point in an LDAP directory. Typically, it is used to represent a major entity in your enterprise. This can be a real-life division such as Engineering or a logical grouping of directory entries such as People or Groups. In Distinguished Name (DN) syntax, an organizational unit is represented by ou. The Engineering division of a company might exist under ou=Engineering, o=example.com. Employees may be stored under ou=People, o=example.com.

diff --git a/help/en/help/server_group_information.html b/help/en/help/server_group_information.html index 402172a..75dd72e 100644 --- a/help/en/help/server_group_information.html +++ b/help/en/help/server_group_information.html @@ -12,8 +12,14 @@ Use this panel to view or edit server group information. You can edit the following information about the selected server group:

-Group name. Specifies the name of the server group as displayed in the network tree. The group name usually indicates the type of group that is selected. For example, Western Sales Servers or Example Corporation's Directory Servers. +Group name. Specifies the name of the server group as displayed in the network tree. The group name usually indicates the type of group that is selected. For example, Western Sales Servers, Finance Department's Directory Server, or Example Corporation's Messaging Servers.

Description. (Optional) Contains a brief description of this server group. For example, Servers for the Western region sales force.

+

+You can view, but not edit, the following information about the selected server group: +

+

+Installation path. Indicates the path to this server group. This path is also called the "server root." +

diff --git a/help/en/help/server_information.html b/help/en/help/server_information.html index c0cf07c..0727adf 100644 --- a/help/en/help/server_information.html +++ b/help/en/help/server_information.html @@ -15,7 +15,7 @@ Use this panel to open a server or edit server information. You can edit the following information about the selected server:

-Server Name. Specifies the name of the server as displayed in the network tree. The server name usually indicates the type of server that is selected. For example, Administration Server or Directory Server. +Server Name. Specifies the name of the server as displayed in the network tree. The server name usually indicates the type of server that is selected. For example, Administration Server, Messaging Server, or Directory Server.

Description. (Optional) Contains a brief description of this server. For example, Directory Server for the Eastern region sales force. @@ -27,6 +27,9 @@ You can view, but not edit, the following information about the selected server: Installation Date. Indicates date and time the server was installed.

+Server Root. Indicates directory where the server binaries are installed. +

+

Product Name. Indicates the server's official product name.

@@ -42,7 +45,7 @@ You can view, but not edit, the following information about the selected server: Revision. Indicates whether this server has been upgraded or patched. If no value is present, this is an unpatched installation.

-Security Level. Indicates whether the server uses domestic (128-bit ciphers) or export (40-bit ciphers) encryption levels. +Security Level. Indicates whether the server uses domestic (US based, 128-bit ciphers) or export (non-US based, 40-bit ciphers) encryption levels.

Server Status. Indicates whether the server is on or off. diff --git a/help/en/help/set_security_device_password_change_security_device_password.html b/help/en/help/set_security_device_password_change_security_device_password.html index af3145d..c4e4cd4 100644 --- a/help/en/help/set_security_device_password_change_security_device_password.html +++ b/help/en/help/set_security_device_password_change_security_device_password.html @@ -10,7 +10,7 @@ Use this dialog box to set or change the password for a security device. The first time you use Administration Server's security features, you are prompted to specify a password for the internal (software) security device.

-
    +
    • If you are setting the password for the internal security device for the first time, enter information for the following fields:
      • diff --git a/help/en/help/users_and_groups.html b/help/en/help/users_and_groups.html index d4b8cfd..4f12b15 100644 --- a/help/en/help/users_and_groups.html +++ b/help/en/help/users_and_groups.html @@ -6,7 +6,7 @@ Users and Groups This is a multipurpose dialog box you can use to do the following:

      -
        +
        • Locate existing users or groups
          • diff --git a/help/en/tokens.map b/help/en/tokens.map index 0f87069..f4f6a81 100644 --- a/help/en/tokens.map +++ b/help/en/tokens.map @@ -130,7 +130,7 @@ CertificateDetailDialogPath-help = help/certificate_information_certification_ CertRequestWizard-help = help/certificate_request_wizard_introduction.html CertRequestInfoPage-help = help/certificate_request_wizard_requestor_information.html TokenPasswordPage-help = help/certificate_request_install_wizard_token_password.html -CertRequestSubmissionPage-help = help/certificate_request_wizard_request_submission.html +CertRequestSubmissionPage = help/certificate_request_wizard_request_submission.html ;CERTIFICATE INSTALLATION WIZARD CertInstallCertPage-help = help/certificate_install_wizard_certificate_location.html @@ -144,7 +144,6 @@ CACertificatePane-help = help/manage_certificates_ca_certs.html ;MANAGE REVOKED CERTIFICATES CRLCertificatePane-help = help/manage_certificates_revoked_certs.html InstallCRLDialog-help = help/add_crl_ckl.html -CertificateDetailDialog_CRL-help = help/list_crl_ckl.html ;SECURITY - CONFIGURE SECURITY MODULES PKCSConfigDialog-help = help/configure_security_modules.html @@ -193,5 +192,5 @@ editSNMPManagerHelp = help/add_edit_manager.html HTMLAdmin = help/administration_express.html ViewData = help/administration_express_server_information.html ViewLog = help/administration_express_logs.html -MonReplication = help/replication_monitor.html +replication-Monitor = help/replication_monitor.html ;End diff --git a/src/com/netscape/management/admserv/AdminFrameworkInitializer.java b/src/com/netscape/management/admserv/AdminFrameworkInitializer.java index 875c13d..89172a3 100644 --- a/src/com/netscape/management/admserv/AdminFrameworkInitializer.java +++ b/src/com/netscape/management/admserv/AdminFrameworkInitializer.java @@ -109,19 +109,6 @@ public class AdminFrameworkInitializer extends FrameworkInitializer { public String getAdminURL() { return serverNodeConsoleInfo.getAdminURL(); } - /* We have to make sure we use the same password throughout - * for the main console and for the tasks - if we do not do - * this and we change the password, the tasks will use the - * wrong password. This way, if we change the password from - * either the Configure task, or from the Configuration tab, - * we will use the same password throughout. - */ - public void setAuthenticationPassword(String password) { - serverNodeConsoleInfo.setAuthenticationPassword(password); - } - public String getAuthenticationPassword() { - return serverNodeConsoleInfo.getAuthenticationPassword(); - } }; private void removeTask(TaskObject root, String taskName) { 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/AccessConfigPanel.java b/src/com/netscape/management/admserv/panel/AccessConfigPanel.java index a583dc0..0a62057 100644 --- a/src/com/netscape/management/admserv/panel/AccessConfigPanel.java +++ b/src/com/netscape/management/admserv/panel/AccessConfigPanel.java @@ -56,7 +56,7 @@ public class AccessConfigPanel extends PluginConfigPanel implements SuiConstants Help _help; JCheckBox _cbDSGW; - JLabel _lblUserName; + SingleByteTextField _txtUserName; SingleBytePasswordField _txtPassword, _txtConfirm; @@ -104,6 +104,7 @@ public class AccessConfigPanel extends PluginConfigPanel implements SuiConstants } public void registerEditComponents(EditMonitor editMonitor) { + editMonitor.monitor(_txtUserName); editMonitor.monitor(_txtPassword); editMonitor.monitor(_txtConfirm); //editMonitor.monitor(_cbDSGW); @@ -124,27 +125,42 @@ public class AccessConfigPanel extends PluginConfigPanel implements SuiConstants //String dsgw = (_cbDSGW.isSelected()) ? "on" : "off"; //data.setAttribute(AttrNames.CONFIG_DSGW, dsgw); + String newuid = _txtUserName.getText(); String newpw1 = _txtPassword.getText(); String newpw2 = _txtConfirm.getText(); String olduid = _configData.getAttribute(AttrNames.ADMPW_UID); - // check if password changed - if (newpw1.length() != 0) { - if (!newpw1.equals(newpw2)) { + if (newuid.length() == 0) { + throw new ValidationException("", _i18nMsgEnterUID); + } + // User name changed + else if (!olduid.equals(newuid)) { + if (newpw1.length() == 0) { + throw new ValidationException("", _i18nMsgEnterPWD); + } else if (!newpw1.equals(newpw2)) { throw new ValidationException("", _i18nMsgPWDMismatch); } + } else { // check if password changed + if (newpw1.length() != 0) { + if (!newpw1.equals(newpw2)) { + throw new ValidationException("", _i18nMsgPWDMismatch); + } + } } + if (! newuid.equals(olduid)) { + Debug.println("CHANGE UID TO " + newuid); + _configData.setAttribute(AttrNames.ADMPW_UID, newuid); + } if (newpw1.length() > 0) { - Debug.println("CHANGE PWD TO " + newpw1); + Debug.println("CHANGE PWD "); _configData.setAttribute(AttrNames.ADMPW_PWD, newpw1); } } private void setUserName(String name) { - _lblUserName.setText((name == null) ? "" : name); - _lblUserName.repaint(); + _txtUserName.setText((name == null) ? "" : name); } @@ -192,14 +208,13 @@ public class AccessConfigPanel extends PluginConfigPanel implements SuiConstants GBC.NONE); //fill group.add(uidLabel, gbc); - // Changed from textfield to a label whose contents is fetched by the CGI - _lblUserName = new JLabel("."); // will be overridden + _txtUserName = new SingleByteTextField(16); gbc.setInsets(0, DIFFERENT_COMPONENT_SPACE, 0, 0); gbc.setGrid(1, 0, 1, 1); gbc.setSpace(0.0, 0.0, GBC.WEST, // anchor GBC.HORIZONTAL); //fill - group.add(_lblUserName, gbc); - uidLabel.setLabelFor(_lblUserName); + group.add(_txtUserName, gbc); + uidLabel.setLabelFor(_txtUserName); JLabel pwdLabel = new JLabel(_i18nPWD); gbc.setInsets(COMPONENT_SPACE, 0, 0, 0); diff --git a/src/com/netscape/management/admserv/panel/CGIAccessSetup.java b/src/com/netscape/management/admserv/panel/CGIAccessSetup.java index c26cfd0..f7a88d0 100644 --- a/src/com/netscape/management/admserv/panel/CGIAccessSetup.java +++ b/src/com/netscape/management/admserv/panel/CGIAccessSetup.java @@ -50,7 +50,6 @@ public class CGIAccessSetup extends CGIDataModel { /** * CGI arguments used in setConfiguration() */ - // We may want to remove this since we won't be calling set with a new UID public String getCGIParamsForSetOp() { String uid = getAttribute(AttrNames.ADMPW_UID); return "op=set&" + AttrNames.ADMPW_UID + "=" + @@ -62,7 +61,7 @@ public class CGIAccessSetup extends CGIDataModel { super.save(); - // Use change-sie-password command to change the password + // Use change-sie-passwod command to change the password String pwd = getAttribute(AttrNames.ADMPW_PWD); if (pwd != null) { @@ -82,12 +81,7 @@ public class CGIAccessSetup extends CGIDataModel { if (0 == task.exec()) { // Since we've updated the Admin Password, // let's update the one in _consoleInfo. - // But, only do this if we are logged in as the admin user! - String authDN = _consoleInfo.getAuthenticationDN().toLowerCase(); - String authUID = getAttribute(AttrNames.ADMPW_UID).toLowerCase(); - if (authDN.matches("uid=" + authUID + ", *ou=administrators, *ou=topologymanagement, *o=netscaperoot")) { - _consoleInfo.setAuthenticationPassword(pwd); - } + _consoleInfo.setAuthenticationPassword(pwd); } int status = task.getStatus(); @@ -96,4 +90,6 @@ public class CGIAccessSetup extends CGIDataModel { _consoleInfo); } } + + } diff --git a/src/com/netscape/management/admserv/panel/CGIDataModel.java b/src/com/netscape/management/admserv/panel/CGIDataModel.java index 370597b..7aa9a98 100644 --- a/src/com/netscape/management/admserv/panel/CGIDataModel.java +++ b/src/com/netscape/management/admserv/panel/CGIDataModel.java @@ -258,8 +258,7 @@ public abstract class CGIDataModel implements IConfigDataModel { int status = task.getStatus(); _loaded = (status == 0); - Debug.println("CGIDataModel.getConfiguration(): called URL " + - adminURL + " "+status); + Debug.println(adminURL + " "+status); AdminOperation.processAdmTaskStatus(adminURL, task, _consoleInfo); 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