From b7c80189f04f51a3d8c3870256424573239cff23 Mon Sep 17 00:00:00 2001
From: Brian Caruso <bdc34@cornell.edu>
Date: Tue, 16 Jul 2013 14:40:12 -0400
Subject: [PATCH 1/4] Adding SearchService to web.xml VIVO-98

---
 productMods/WEB-INF/web.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 7ba05e4c..726bfba1 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -1361,7 +1361,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>

From 1d16f165dc4a69afa7a90a486ac0cdba865ba822 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Wed, 17 Jul 2013 13:01:33 -0400
Subject: [PATCH 2/4] VIVO-213 smoke test to check JVM temp directory

If it isn't set, if it isn't a directory, if we can't access it, if we can't create a temp file, complain.
---
 productMods/WEB-INF/resources/startup_listeners.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/productMods/WEB-INF/resources/startup_listeners.txt b/productMods/WEB-INF/resources/startup_listeners.txt
index ed5c8e4c..d27cd019 100644
--- a/productMods/WEB-INF/resources/startup_listeners.txt
+++ b/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

From e9c25cd2079c904be56190dc05faf03a1fc840e8 Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Wed, 17 Jul 2013 13:23:28 -0400
Subject: [PATCH 3/4] Remove extraneous closing brace

---
 themes/wilma/templates/footer.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/wilma/templates/footer.ftl b/themes/wilma/templates/footer.ftl
index e1d9f632..50b01a94 100644
--- a/themes/wilma/templates/footer.ftl
+++ b/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>

From 113f7ba94b48e3906ba4a88af7a4e29c4cc5f22b Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Wed, 17 Jul 2013 15:47:58 -0400
Subject: [PATCH 4/4] Remove reference to N3EditFormController, which was
 removed in 0e26d45a31

---
 productMods/WEB-INF/web.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 726bfba1..0b2850e1 100644
--- a/productMods/WEB-INF/web.xml
+++ b/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>