[Ogoglio-commits] SF.net SVN: ogoglio: [664] maven/trunk/ogoglio-server/src

[<tre...@us...>]

Revision: 664
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=664&view=rev
Author:   trevorolio
Date:     2008-01-02 14:06:59 -0800 (Wed, 02 Jan 2008)

Log Message:
-----------
Moved the mail code to appdev so it can be used by other webapps.

Modified Paths:
--------------
    maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java
    maven/trunk/ogoglio-server/src/test/java/com/ogoglio/mail/test/MailTest.java

Removed Paths:
-------------
    maven/trunk/ogoglio-server/src/main/java/com/ogoglio/mail/

Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java	2008-01-02 10:15:57 UTC (rev 663)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java	2008-01-02 22:06:59 UTC (rev 664)
@@ -17,6 +17,7 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import javax.media.j3d.Transform3D;
@@ -36,14 +37,12 @@
 import com.ogoglio.mail.MailClient;
 import com.ogoglio.mail.MailFormatter;
 import com.ogoglio.mail.MailSendException;
-import com.ogoglio.mail.MailTemplateFactory;
 import com.ogoglio.media.MediaService;
 import com.ogoglio.persist.AccountPersistTasks;
 import com.ogoglio.persist.AccountRecord;
 import com.ogoglio.persist.BodyConfigurationRecord;
 import com.ogoglio.persist.BodyPersistTasks;
 import com.ogoglio.persist.BodySettingRecord;
-import com.ogoglio.persist.BodyTextureRecord;
 import com.ogoglio.persist.PendingEmailValidationRecord;
 import com.ogoglio.persist.PendingEmailValidationTasks;
 import com.ogoglio.persist.PossessionPersistTasks;
@@ -72,6 +71,8 @@
 
     public static final String SECRET_PARAMETER = "secret";
 
+    public static final String EMAIL_VALIDATION_TEMPLATE = "EmailValidationTemplate.txt";
+
     public String defaultAccountPhotoPath = null;
 
     public static URI getAccountURI(AccountRecord accountRecord, URI baseURI) {
@@ -404,8 +405,8 @@
         String validationURL = getSiteInfo().getBaseUrl() + "account/validate?" + SECRET_PARAMETER + "=" + validationRecord.getSecret();
 
         MailFormatter mailFormatter = new MailFormatter();
-        Map validationMap = MailTemplateFactory.createEmailValidationMap(validationRecord.getEmail(), validationURL, "Ogoglio", getSiteInfo().getBaseUrl());
-        String body = mailFormatter.format(validationMap, MailTemplateFactory.getTemplate(MailTemplateFactory.EMAIL_VALIDATION_TEMPLATE));
+        Map validationMap = createEmailValidationMap(validationRecord.getEmail(), validationURL, "Ogoglio", getSiteInfo().getBaseUrl());
+        String body = mailFormatter.format(validationMap, getTemplate(EMAIL_VALIDATION_TEMPLATE));
 
         MailClient mailClient = null;
         if (getSiteInfo().getMailDirectory() == null) {
@@ -417,6 +418,23 @@
         Log.info("Sent validation email to " + validationRecord.getEmail());
     }
 
+    public static String getTemplate(String templateName) {
+        try {
+            return StreamUtils.readResource("mail/" + templateName);
+        } catch (IOException e) {
+            return null;
+        }
+    }
+
+    public static Map createEmailValidationMap(String emailToValidate, String validationURL, String serviceName, String serviceURL) {
+        HashMap map = new HashMap();
+        map.put("emailToValidate", emailToValidate);
+        map.put("validationURL", validationURL);
+        map.put("serviceName", serviceName);
+        map.put("serviceURL", serviceURL);
+        return map;
+    }
+
     private class EmailValidationResource extends AuthenticatedSiteResource {
         public EmailValidationResource() {
             super("validate", false, getSessionFactory());

Modified: maven/trunk/ogoglio-server/src/test/java/com/ogoglio/mail/test/MailTest.java
===================================================================
--- maven/trunk/ogoglio-server/src/test/java/com/ogoglio/mail/test/MailTest.java	2008-01-02 10:15:57 UTC (rev 663)
+++ maven/trunk/ogoglio-server/src/test/java/com/ogoglio/mail/test/MailTest.java	2008-01-02 22:06:59 UTC (rev 664)
@@ -11,7 +11,6 @@
 import com.ogoglio.mail.MailClient;
 import com.ogoglio.mail.MailFormatter;
 import com.ogoglio.mail.MailSendException;
-import com.ogoglio.mail.MailTemplateFactory;
 import com.ogoglio.util.ArgumentUtils;
 import com.ogoglio.util.StreamUtils;
 
@@ -40,7 +39,7 @@
 
         mailFormatter1 = new MailFormatter();
 
-        testTemplate1 = MailTemplateFactory.getTemplate(MailTemplateFactory.TEST_TEMPLATE_1);
+        testTemplate1 = StreamUtils.readResource("mail/TestTemplate1.txt");
         assertNotNull(testTemplate1);
 
         testMap1 = new HashMap();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.