[Ogoglio-commits] SF.net SVN: ogoglio: [665] maven/trunk/ogoglio-appdev

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

Revision: 665
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=665&view=rev
Author:   trevorolio
Date:     2008-01-02 14:07:11 -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-appdev/pom.xml
    maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java

Added Paths:
-----------
    maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/mail/

Removed Paths:
-------------
    maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/mail/MailTemplateFactory.java

Modified: maven/trunk/ogoglio-appdev/pom.xml
===================================================================
--- maven/trunk/ogoglio-appdev/pom.xml	2008-01-02 22:06:59 UTC (rev 664)
+++ maven/trunk/ogoglio-appdev/pom.xml	2008-01-02 22:07:11 UTC (rev 665)
@@ -15,6 +15,12 @@
 	
 	<dependencies>
 		<dependency>
+			<groupId>com.sun</groupId>
+			<artifactId>mail</artifactId>
+			<version>1.4</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate</artifactId>
 			<version>3.2.1.ga</version>

Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java	2008-01-02 22:06:59 UTC (rev 664)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java	2008-01-02 22:07:11 UTC (rev 665)
@@ -27,9 +27,13 @@
     private String ogoglioUsername = null;
 
     private String ogoglioPassword = null;
-    
+
+    private String mailDirectory = null;
+
+    private String baseURL = null;
+
     public abstract String getOgoglioUsernameContextKey();
-    
+
     public abstract String getOgoglioPasswordContextKey();
 
     public void init(ServletConfig config) throws ServletException {
@@ -41,7 +45,10 @@
             ArgumentUtils.assertNotEmpty(ogoglioUsername);
             ogoglioPassword = (String) envCtx.lookup(getOgoglioPasswordContextKey());
             ArgumentUtils.assertNotEmpty(ogoglioPassword);
-            
+            mailDirectory = (String) envCtx.lookup("ogoglio/mailDirectory");
+            if(mailDirectory.length() == 0){
+                mailDirectory = null;
+            }
         } catch (NamingException e) {
             throw new ServletException("Could not init EventServlet (probably forgot env variables in setup.xml): " + e);
         }
@@ -66,8 +73,7 @@
         super.service(request, response);
     }
 
-
-	public AuthDocument getAuthDocument(HttpServletRequest request) throws IOException {
+    public AuthDocument getAuthDocument(HttpServletRequest request) throws IOException {
         String authCookie = getRequestAuthCookie(request);
         if (authCookie == null) {
             return null;
@@ -82,8 +88,13 @@
     public String getOgoglioUsername() {
         return ogoglioUsername;
     }
-    
-    public String getOgoglioPassword(){
+
+    public String getOgoglioPassword() {
         return ogoglioPassword;
     }
+
+    public String getMailDirectory() {
+        return mailDirectory;
+    }
+
 }

Copied: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/mail (from rev 632, maven/trunk/ogoglio-server/src/main/java/com/ogoglio/mail)

Deleted: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/mail/MailTemplateFactory.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/mail/MailTemplateFactory.java	2007-12-13 01:58:05 UTC (rev 632)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/mail/MailTemplateFactory.java	2008-01-02 22:07:11 UTC (rev 665)
@@ -1,33 +0,0 @@
-package com.ogoglio.mail;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.ogoglio.util.StreamUtils;
-
-public class MailTemplateFactory {
-
-    private static final String TEMPLATE_RESOURCE_PATH = "mail/";
-
-    public static final String TEST_TEMPLATE_1 = "TestTemplate1.txt";
-
-    public static final String EMAIL_VALIDATION_TEMPLATE = "EmailValidationTemplate.txt";
-
-    public static String getTemplate(String templateName) {
-        try { 
-            return StreamUtils.readResource(TEMPLATE_RESOURCE_PATH + 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;
-    }
-}


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