Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop

productMods/WEB-INF/resources/startup_listeners.txt

@@ -5,6 +5,8 @@
 #     https://sourceforge.net/apps/mediawiki/vivo/index.php?title=The_StartupManager
 #
 
+edu.cornell.mannlib.vitro.webapp.servlet.setup.JvmSmokeTests
+
 edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSetup
 
 edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSmokeTests

productMods/WEB-INF/web.xml

@@ -281,15 +281,6 @@
     <url-pattern>/ajax/sparqlQuery</url-pattern>    
   </servlet-mapping>
   
-  <servlet>
-    <servlet-name>N3EditFormController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.N3EditFormController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>N3EditFormController</servlet-name>
-    <url-pattern>/N3EditForm</url-pattern>
-  </servlet-mapping>
-
   <servlet>
     <servlet-name>AboutController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.AboutController</servlet-class>
@@ -1361,7 +1352,15 @@
     <servlet-name>GetObjectClasses</servlet-name>
     <url-pattern>/admin/getObjectClasses</url-pattern>
   </servlet-mapping>
-  
+
+  <servlet>
+    <servlet-name>SearchServiceController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.SearchServiceController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>SearchServiceController</servlet-name>
+    <url-pattern>/searchService/*</url-pattern>
+  </servlet-mapping>
   
   <servlet>
     <servlet-name>SmokeTestController</servlet-name>

themes/wilma/templates/footer.ftl

@@ -13,7 +13,7 @@
             </#if>
              | <a class="terms" href="${urls.termsOfUse}" title="${i18n().menu_termuse}">${i18n().menu_termuse}</a></small> | 
         </#if>
-        ${i18n().menu_powered} <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank" title="${i18n().menu_powered} VIVO"><strong>VIVO}</strong></a>
+        ${i18n().menu_powered} <a class="powered-by-vivo" href="http://vivoweb.org" target="_blank" title="${i18n().menu_powered} VIVO"><strong>VIVO</strong></a>
         <#if user.hasRevisionInfoAccess>
              | ${i18n().menu_version} <a href="${version.moreInfoUrl}" title="${i18n().menu_version}">${version.label}</a>
         </#if>