From 589e2b4fd60355f8127c3722f9ae64a7915ac751 Mon Sep 17 00:00:00 2001 From: j2blake Date: Thu, 9 Jun 2011 14:43:02 +0000 Subject: [PATCH] NIHVIVO-2299 NIHVIVO-2279 Merge from the dev branch - replace User with UserAccounts, implement the root user policy. --- doc/install.html | 49 +++++++--- doc/upgrade-1.3.html | 6 ++ example.deploy.properties | 6 +- productMods/WEB-INF/web.xml | 27 ++--- .../templates/edit/specific/user_edit.jsp | 98 ------------------- .../siteAdmin/siteAdmin-siteConfiguration.ftl | 7 +- themes/wilma/templates/identity.ftl | 3 +- 7 files changed, 51 insertions(+), 145 deletions(-) delete mode 100644 productMods/templates/edit/specific/user_edit.jsp diff --git a/doc/install.html b/doc/install.html index 206382bd..be4a53c4 100644 --- a/doc/install.html +++ b/doc/install.html @@ -412,19 +412,36 @@ - Specify an SMTP host that the form will use for + Specify an SMTP host that the application will use for sending e-mail (Optional). If this is left blank, the contact form will - be hidden and disabled. + be hidden and disabled, and users will not be notified of changes to their accounts. - Vitro.smtpHost + email.smtpHost smtp.servername.edu + + + Specify an email address which will appear as the sender in e-mail + notifications to users (Optional). + If a user replies to the notification, this address will receive the reply. + If a user's e-mail address is invalid, this address will receive the error notice. + If this is left blank, users will not be notified of changes to their accounts. + + + + + email.replyTo + + + vivoAdmin@my.domain.edu + + Specify the JDBC URL of your database. Change @@ -564,18 +581,18 @@ - Specify the name of your first admin user for + Specify the email address of the root user account for the VIVO application. This user will have an initial temporary password - of 'defaultAdmin'. You will be prompted to create a new password on + of 'rootPassword'. You will be prompted to create a new password on first login. - initialAdminUser + rootUser.emailAddress - defaultAdmin + vivoAdmin@my.domain.edu @@ -711,9 +728,9 @@

If the startup was successful, you will see a welcome message informing you that you have successfully installed VIVO. Click the "Log - in" link near the upper right corner. Log in with the initialAdminUser - username you set up in Step IV. The initial password for the initialAdminUser - account is "defaultAdmin" (without the quotes). On first login, you + in" link near the upper right corner. Log in with the rootUser.emailAddress + you set up in Step IV. The initial password for the root + account is "rootPassword" (without the quotes). On first login, you will be prompted to select a new password and verify it a second time.

@@ -745,7 +762,7 @@ "Contact Us" form)

If you have configured your application to use the "Contact Us" - feature in Step IV (Vitro.smtpHost), you will also need to + feature in Step IV (email.smtpHost), you will also need to add an email address to the VIVO application.  This is the email to which the contact form will submit. It can be a list server or an individual's email address. @@ -758,7 +775,7 @@ Email Address" and submit the change.

- If you set the Vitro.smtpHost + If you set the email.smtpHost in Step IV and do NOT provide an email address in this step, your users will receive a java error in the interface. @@ -945,7 +962,9 @@ In addition, VIVO will try to associate the user with a profile page, so the user may edit his own profile data. VIVO will search the data model for a person with a property that matches the User’s network - ID. You need to tell VIVO what property should be used for matching. + ID + (the value of the property must be either a String literal or an untyped literal). + You need to tell VIVO what property should be used for matching. Insert a line like this in the deploy.properties file: 

selfEditing.idMatchingProperty = [the URI of the property]
@@ -997,8 +1016,8 @@ + +

Changes to Authorization [see JB for further details]

+