Applied patch ACT-456 to trunk also

modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngineConfiguration.java

@@ -111,6 +111,7 @@ public abstract class ProcessEngineConfiguration {
   protected String mailServerUsername; // by default no name and password are provided, which 
   protected String mailServerPassword; // means no authentication for mail server
   protected int mailServerPort = 25;
+  protected boolean useTLS = false;
   protected String mailServerDefaultFrom = "activiti@localhost";
 
   protected String databaseType;
@@ -255,6 +256,17 @@ public abstract class ProcessEngineConfiguration {
   }
 
   
+  public boolean getMailServerUseTLS() {
+    return useTLS;
+  }
+
+  
+  public ProcessEngineConfiguration setMailServerUseTLS(boolean useTLS) {
+    this.useTLS = useTLS;
+    return this;
+  }
+
+  
   public String getMailServerDefaultFrom() {
     return mailServerDefaultFrom;
   }

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/MailActivityBehavior.java

@@ -173,6 +173,8 @@ public class MailActivityBehavior extends AbstractBpmnActivityBehavior {
     int port = processEngineConfiguration.getMailServerPort();
     email.setSmtpPort(port);
 
+    email.setTLS(processEngineConfiguration.getMailServerUseTLS());
+
     String user = processEngineConfiguration.getMailServerUsername();
     String password = processEngineConfiguration.getMailServerPassword();
     if (user != null && password != null) {

modules/activiti-engine/src/main/java/org/activiti/engine/impl/cfg/ProcessEngineConfigurationImpl.java

@@ -1415,6 +1415,12 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
     return this;
   }
 
+  @Override
+  public ProcessEngineConfigurationImpl setMailServerUseTLS(boolean useTLS) {
+    super.setMailServerUseTLS(useTLS);
+    return this;
+  }
+
   @Override
   public ProcessEngineConfigurationImpl setMailServerUsername(String mailServerUsername) {
     super.setMailServerUsername(mailServerUsername);