From 9593b175a8d928203979602b1c4ea3a33b462a6c Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 24 May 2011 19:30:55 +0000
Subject: [PATCH] NIHVIVO-2279 Implement FreemarkerEmailFactory and standardize
 on it. Change the parameters used to enable e-mail.

---
 doc/upgrade-1.3.html        | 13 ++++++++++++-
 productMods/WEB-INF/web.xml |  4 ++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/doc/upgrade-1.3.html b/doc/upgrade-1.3.html
index f2a78ee7..c214dff6 100644
--- a/doc/upgrade-1.3.html
+++ b/doc/upgrade-1.3.html
@@ -28,7 +28,18 @@
                 </ul>
             </toc>
             
-            <h3>upload.directory and LuceneSetup.indexDir are merged into vitro.home.directory.</h3>
+            <h3>upload.directory and LuceneSetup.indexDir are merged into vitro.home.directory [see JB for further details]</h3>
+
+            <h3>Email parameters in deploy.properties have changed. [see JB for further details]</h3>
+            <ul>
+                <li>
+                    Vitro.smtpHost is replaced by email.smtpHost
+                </li>
+                <li>
+                    Added email.replyTo as the "from" and "reply-to" address 
+                    that appear in emails sent by the application.
+                </li>
+            </ul>
         
             <h3>Template changes [see RY for further details]</h3>
             <ul>
diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 517184b7..e05793fa 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -50,6 +50,10 @@
     <listener-class>edu.cornell.mannlib.vitro.webapp.config.RevisionInfoSetup</listener-class>
   </listener>
 
+  <listener>
+    <listener-class>edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory$Setup</listener-class>
+  </listener>
+
   <!-- DefaultThemeSetup needs to run before the JenaDataSourceSetup
        to allow creation of default portal and tab -->
   <listener>