From 699358fae01d6ab1c7f80b02f8749c46767198d6 Mon Sep 17 00:00:00 2001 From: lutoff <lutoff@localhost> Date: Tue, 06 Jan 2009 11:29:17 +0000 Subject: [PATCH] When opends is delivered in the enterprise Sun OpenDS Standard Edition product, it is required that the user approves the license to be able to use it. The place where this approval takes place is in the quicksetup application. On the other hand, for now, there is no license approval to be done for the opensource version. The modifications here try to address both requirements. A new step is now added to the setup cli mode to allow the display of a license for the user to approve. This step only shows up if a license exists in a specific location in the layout (Legal/license_to_accept.txt). Thus in the opensource version, no license will be in the delivery whereas the enterprise product will include one. The setup tool will display the license text whenever applicable. Note: in the absence of the Legal/license_to_accept.txt file, setup behaves the same way as before When the license file exists, the new step "license accept" shows up. --- opends/src/messages/messages/quicksetup.properties | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/opends/src/messages/messages/quicksetup.properties b/opends/src/messages/messages/quicksetup.properties index 8cae824..ac7cf05 100644 --- a/opends/src/messages/messages/quicksetup.properties +++ b/opends/src/messages/messages/quicksetup.properties @@ -20,7 +20,7 @@ # # CDDL HEADER END # -# Copyright 2006-2008 Sun Microsystems, Inc. +# Copyright 2006-2009 Sun Microsystems, Inc. @@ -1336,6 +1336,10 @@ INFO_LICENSE_DETAILS_LABEL=Please read the following License Agreement.\n\ You must accept the terms of the agreement before continuing with the installation. INFO_LICENSE_CLICK_LABEL=Click to accept +INFO_LICENSE_CLI_ACCEPT_QUESTION=Accept the license (%s/%s) [%s]: +INFO_LICENSE_CLI_ACCEPT_YES=Yes +INFO_LICENSE_CLI_ACCEPT_NO=No +INFO_LICENSE_CLI_ACCEPT_INVALID_RESPONSE=Invalid response INFO_CONFIRM_UNINSTALL_STEP=Uninstall Options INFO_ZIP_FILES_DESCRIPTION=OpenDS Installation Package (.zip) SEVERE_ERR_COULD_NOT_FIND_REPLICATIONID=Could not find a remote peer to \ -- Gitblit v1.10.0