VIVO-769 Merge branch 'feature/orcid' into develop

This commit is contained in:
j2blake 2014-05-07 17:32:38 -04:00
parent 73fbe66534
commit 939950dcd4
25 changed files with 1551 additions and 1 deletions

View file

@ -85,5 +85,7 @@ org.apache.commons.fileupload.servlet.FileCleanerCleanup
# and the PermissionRegistry must already be set up.
edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache$Setup
edu.cornell.mannlib.vivo.orcid.OrcidContextSetup
# This should be near the end, because it will issue a warning if the connection to Solr times out.
edu.cornell.mannlib.vitro.webapp.servlet.setup.SolrSmokeTest