From 816a2b56298176382d487899519bfe8e54ed3baa Mon Sep 17 00:00:00 2001
From: meyerd <meyerd@51b7ce9a-3489-0410-86de-dc9a27cf12c7>
Date: Tue, 22 Mar 2011 07:03:22 +0000
Subject: [PATCH] Made "fromEmailAddress" configurable

---
 ...ractProcessSolutionStateEmailListener.java |  7 +---
 .../CycleNotificationEmailAddresses.java      | 34 +++++++++++++++++++
 ...ionDoneUpdateOperationalProcessModels.java |  6 +++-
 ...cificationDoneGenerateProjectListener.java |  8 +++--
 4 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/CycleNotificationEmailAddresses.java

diff --git a/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/AbstractProcessSolutionStateEmailListener.java b/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/AbstractProcessSolutionStateEmailListener.java
index 5114666171..68e19ee647 100644
--- a/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/AbstractProcessSolutionStateEmailListener.java
+++ b/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/AbstractProcessSolutionStateEmailListener.java
@@ -22,15 +22,10 @@ public abstract class AbstractProcessSolutionStateEmailListener<T extends Proces
 
   protected Logger logger = Logger.getLogger(getClass().getName());
 
-  /**
-   * TODO: Make configurable (it is important to have a valid address here, otherwise the sending fails with a 550 error)
-   * Use configuration property from activiti cfg.xml (mailServerDefaultFrom)
-   */
-  public static String fromEmailAddress = "activiti@camunda.com";
-
   protected CycleEmailDispatcher cycleEmailDispatcher = CycleComponentFactory.getCycleComponentInstance(CycleEmailDispatcher.class, CycleEmailDispatcher.class);
 
   public void onEvent(T event) {
+    String fromEmailAddress = CycleComponentFactory.getCycleComponentInstance(CycleNotificationEmailAddresses.class).getFromEmailAddress();
     try {
       for (User user : getRecipients(event.getProcessSolution())) {
         cycleEmailDispatcher.sendEmail(fromEmailAddress, user.getEmail(), getSubject(event), getMessage(event));
diff --git a/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/CycleNotificationEmailAddresses.java b/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/CycleNotificationEmailAddresses.java
new file mode 100644
index 0000000000..c2a6e74cc7
--- /dev/null
+++ b/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/CycleNotificationEmailAddresses.java
@@ -0,0 +1,34 @@
+package org.activiti.cycle.impl.processsolution.listener;
+
+import org.activiti.cycle.annotations.CycleComponent;
+import org.activiti.cycle.context.CycleContextType;
+import org.activiti.cycle.service.CycleServiceFactory;
+import org.activiti.engine.ProcessEngines;
+import org.activiti.engine.impl.ProcessEngineImpl;
+
+/**
+ * Holds the email addresses for sending notifications
+ * 
+ * @author daniel.meyer@camunda.com
+ */
+@CycleComponent(context = CycleContextType.NONE)
+public class CycleNotificationEmailAddresses {
+
+  private String fromEmailAddress;
+
+  public String getFromEmailAddress() {    
+    if (fromEmailAddress == null) {
+      fromEmailAddress = CycleServiceFactory.getConfigurationService().getConfigurationValue("NotificationEmailAddresses", "defaultFromEmailAddress");      
+    }
+    if(fromEmailAddress == null) {
+      fromEmailAddress = ((ProcessEngineImpl) ProcessEngines.getDefaultProcessEngine()).getProcessEngineConfiguration().getMailServerDefaultFrom();
+    }
+    if(fromEmailAddress == null 
+            || fromEmailAddress.equals("activiti@localhost") // activiti@localhost does not work for most mailservers
+            ) {
+      fromEmailAddress = "activiti@camunda.com";
+    }
+    return fromEmailAddress;
+  }
+
+}
diff --git a/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/ImplementationDoneUpdateOperationalProcessModels.java b/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/ImplementationDoneUpdateOperationalProcessModels.java
index 4ad218af59..dac0b44cc2 100644
--- a/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/ImplementationDoneUpdateOperationalProcessModels.java
+++ b/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/ImplementationDoneUpdateOperationalProcessModels.java
@@ -131,9 +131,13 @@ public class ImplementationDoneUpdateOperationalProcessModels implements CycleEv
         writer.append("</li>");
       }
       writer.append("</ul>");
-      cycleEmailDispatcher.sendEmail(AbstractProcessSolutionStateEmailListener.fromEmailAddress, user.getEmail(), "Operational models updated", writer.toString());
+      cycleEmailDispatcher.sendEmail(getFromEmailAddress(), user.getEmail(), "Operational models updated", writer.toString());
     }
   }
+  
+  protected String getFromEmailAddress() {
+    return CycleComponentFactory.getCycleComponentInstance(CycleNotificationEmailAddresses.class).getFromEmailAddress();
+  }
 
   protected ProcessSolutionUtils getProcessSolutionUtils() {
     return CycleComponentFactory.getCycleComponentInstance(ProcessSolutionUtils.class);
diff --git a/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/SpecificationDoneGenerateProjectListener.java b/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/SpecificationDoneGenerateProjectListener.java
index d943738bea..450774978b 100644
--- a/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/SpecificationDoneGenerateProjectListener.java
+++ b/modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/processsolution/listener/SpecificationDoneGenerateProjectListener.java
@@ -172,7 +172,7 @@ public class SpecificationDoneGenerateProjectListener implements CycleCompensati
         writer.append("</li>");
       }
       writer.append("</ul>");
-      cycleEmailDispatcher.sendEmail(AbstractProcessSolutionStateEmailListener.fromEmailAddress, user.getEmail(), "Technical Model created", writer.toString());
+      cycleEmailDispatcher.sendEmail(getFromEmailAddress(), user.getEmail(), "Technical Model created", writer.toString());
     }
   }
 
@@ -192,9 +192,13 @@ public class SpecificationDoneGenerateProjectListener implements CycleCompensati
         writer.append("</li>");
       }
       writer.append("</ul>");
-      cycleEmailDispatcher.sendEmail(AbstractProcessSolutionStateEmailListener.fromEmailAddress, user.getEmail(), "Technical Models updated/created", writer.toString());
+      cycleEmailDispatcher.sendEmail(getFromEmailAddress(), user.getEmail(), "Technical Models updated/created", writer.toString());
     }
   }
+  
+  protected String getFromEmailAddress() {
+    return CycleComponentFactory.getCycleComponentInstance(CycleNotificationEmailAddresses.class).getFromEmailAddress();
+  }
 
   public void compensateEvent(SpecificationDoneEvent event) {
     // TODO: delete technical implementation project in first iteration
-- 
GitLab