Merge 9385 from 1.4 maint branch

This commit is contained in:
j2blake 2011-12-13 19:05:03 +00:00
parent 51a2eee34b
commit 1a201b9037

View file

@ -36,7 +36,7 @@
starting with an empty database, an empty Vitro home directory,
and a Tomcat installation with no Vitro webapp.
If you are upgrading a previous installation of Vitro,
you should consult the applicable “upgrade” file(s) in this directory.
you may need to adjust your procedure accordingly.
</p>
<br>
<hr><!-- Page break --><!-- Introduction to the Vitro installation --><h2 id="introduction">Introduction to the Vitro installation</h2>
@ -271,7 +271,8 @@
</p>
<h3 id="deploy_properties">IV. Specify deployment properties </h3>
<p>
In the <code>webapp</code> directory of the Vitro distribution, copy the file <code>example.deploy.properties</code>
In the <code>webapp/config</code> directory of the Vitro distribution,
copy the file <code>example.deploy.properties</code>
to a file named simply <code>deploy.properties</code>. This file sets
several properties used in compilation and deployment.
</p>
@ -636,8 +637,8 @@
</table>
<h3 id="deploy">V. Compile and deploy</h3>
<p>
At the command line, from the top level of the Vitro distribution
directory, type:
At the command line, change to the <code>webapp</code> directory inside the Vitro distribution
directory. Then type:
</p>
<pre> ant all<br> </pre>
<p>
@ -704,7 +705,7 @@
</p>
<p>
See <a href="#tomcat_connector">Section X</a> below,
for an example of overriding the VIVO context fragment.
for an example of overriding the Vitro context fragment.
</p>
<h3 id="start_tomcat">VII. Start Tomcat </h3>
@ -942,77 +943,23 @@
</li>
</ul>
<p>
Here is a simple test to see whether the ontology files were
loaded:
Step VII also shows that the Vitro self-tests ran successfully.
When Tomcat starts the Vitro webapp, it runs several tests.
If any of these tests produce warnings or error message,
you would see them instead of the Vitro home page.
</p>
<p>
Among other things, the self-tests check
</p>
<ul>
<li>
Click on the "Index" link on the upper right, below the logo.
You should see a "locations" section, with links for "Country" and
"Geographic Location." The index is built in a background thread, so on
your first login, you may see an empty index instead. Refresh the page
periodically to see whether the index will be populated. This may take
some time: with Vitro installed on a modest laptop computer, loading the
ontology files and building the index took more than 5 minutes from the
time that Tomcat was started.
</li>
<li>
Click on the "Country" link. You should see an alphabetical list
of the countries of the world.
</li>
<li>The Vitro home directory exists and Vitro can write to it.</li>
<li>Vitro can connect to the database.</li>
<li>Vitro can connect to the Solr search application.</li>
</ul>
<p>
Here is a test to see whether your system is configured to serve
linked data:
If you saw the Vitro home page in Step VII, you know that your installation passed all of these tests.
</p>
<ul>
<li>
Point your browser to the home page of your website, and click
the "Log in" link near the upper right corner. Log in with the <code>rootUser.emailAddress</code>
you set up in Step IV. If this is your first time logging in, you will
be prompted to change the password.
</li>
<li>
After you have successfully logged in, click "site admin" in the
upper right corner. In the drop down under "Data Input" select "Faculty
Member(core)" and click the "Add individual of this class" button.
</li>
<li>
Enter the name "test individual" under the field "Individual
Name," scroll to the bottom, and click "Create New Record." You will be
taken to the "Individual Control Panel." Make note of the value of the
field "URI" - it will be used in the next step.
</li>
<li>
Open a new web browser or browser tab to the page <a href="http://marbles.sourceforge.net/">http://marbles.sourceforge.net/</a>.
In
the
pink
box on that page enter the URI of the individual you
created in the previous step and click "open."
</li>
<li>
In the resulting page search for the URI of the "test
individual." You should find it towards the bottom of the page next to
a red dot followed by "redirect (303)." This indicates that you are
successfully serving linked RDF data. If the URI of the "test
individual" is followed by "failed (400)" you are not successfully
serving linked data.
</li>
</ul>
<p>
Finally, test the search index.
</p>
<ul>
<li>
Type the word "Australia" into the search box, and click on the
Search button.You should see a page of results, with links to countries
that border Australia, individuals that include Australia, and to
Australia itself. If the search is not successful, try rebuilding the search index:
log in as a site
administrator and go to "http://your-vitro-url/SearchIndex".
</li>
</ul>
<h3 id="termsofuse">XIII. Review the Vitro Terms of Use</h3>
<p>
Vitro comes with a "Terms of Use" statement linked from the footer.