merging develop to issue-vivo-101-sparqlupdate

This commit is contained in:
Brian Caruso 2013-08-19 16:21:16 -04:00
commit e6a7ad34d3
41 changed files with 1076 additions and 1640 deletions

View file

@ -9,5 +9,5 @@
# Ontology is complete.
#
# Find out how to use this file at
# https://sourceforge.net/apps/mediawiki/vivo/index.php?title=Using_Short_Views_in_Release_1.5
# https://wiki.duraspace.org/display/VIVO/Using+Short+Views+in+Release+1.5
#

View file

@ -65,6 +65,7 @@ edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup
edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup
edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerSetup
edu.cornell.mannlib.vitro.webapp.freemarker.config.FreemarkerConfiguration$Setup
# On shutdown, this will kill the background thread started by Apache Commons File Upload
org.apache.commons.fileupload.servlet.FileCleanerCleanup