Merge revision 4716 from the branch - for bdc34.

This commit is contained in:
jeb228 2010-04-12 14:22:35 +00:00
parent b49a6e3b3a
commit 1fb7530c57

View file

@ -9,6 +9,15 @@
# #
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
#
# This namespace will be used when generating URIs for objects created in the
# editor. Change it to reflect your own domain. For example, Cornell's
# namespace is http://vivo.cornell.edu/individual/
#
# Note: it is essential that this namespace end with a trailing slash.
#
Vitro.defaultNamespace = http://vitro.mydomain.edu/individual/
# #
# The base install directory for your Tomcat server. The VIVO application # The base install directory for your Tomcat server. The VIVO application
# will be deployed in the /webapps directory below this base. # will be deployed in the /webapps directory below this base.
@ -35,15 +44,6 @@ upload.directory = /usr/local/vivo/data/uploads
# #
LuceneSetup.indexDir = /usr/local/vivo/data/luceneIndex LuceneSetup.indexDir = /usr/local/vivo/data/luceneIndex
#
# This namespace will be used when generating URIs for objects created in the
# editor. Change it to reflect your own domain. For example, Cornell's
# namespace is http://vivo.cornell.edu/individual/
#
# Note: it is essential that this namespace end with a trailing slash.
#
Vitro.defaultNamespace = http://vitro.mydomain.edu/individual/
# #
# SMTP host which the "Contact Us" form can use to send mail. If this is left # SMTP host which the "Contact Us" form can use to send mail. If this is left
# empty, the "Contact Us" form will be disabled. # empty, the "Contact Us" form will be disabled.