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

productMods/WEB-INF/resources/startup_listeners.txt

@@ -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

productMods/WEB-INF/web.xml

@@ -1400,7 +1400,15 @@
     <url-pattern>/searchService/*</url-pattern>
   </servlet-mapping>
   
- 
+  <servlet>
+    <servlet-name>OrcidIntegrationController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vivo.orcid.controller.OrcidIntegrationController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>OrcidIntegrationController</servlet-name>
+    <url-pattern>/orcid/*</url-pattern>
+  </servlet-mapping>
+  
   <!-- ==================== tag libraries ============================== -->
   <jsp-config>
     <taglib>