NIHVIVO-2299 NIHVIVO-2279 Merge from the dev branch - replace User with UserAccounts, implement the root user policy.

This commit is contained in:
j2blake 2011-06-09 14:43:02 +00:00
parent c9ac5a7e1f
commit 589e2b4fd6
7 changed files with 51 additions and 145 deletions

View file

@ -91,11 +91,11 @@ VitroConnection.DataSource.driver = com.mysql.jdbc.Driver
VitroConnection.DataSource.validationQuery = SELECT 1
#
# The name of your first admin user for the VIVO application. The password
# for this user is initially set to "defaultAdmin", but you will be asked to
# The email address of the root user for the VIVO application. The password
# for this user is initially set to "rootPassword", but you will be asked to
# change the password the first time you log in.
#
initialAdminUser = defaultAdmin
rootUser.emailAddress = root@myDomain.com
#
# How is a logged-in user associated with a particular Individual? One way is