[jbpm-commits] JBoss JBPM SVN: r4459 - in jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer: impl and 1 other directory.

[do-not-reply at jboss.org]

Author: bradsdavis
Date: 2009-04-06 11:18:40 -0400 (Mon, 06 Apr 2009)
New Revision: 4459

Modified:
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java
Log:
Changed the Environment to Execution

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java	2009-04-06 14:36:41 UTC (rev 4458)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailProducer.java	2009-04-06 15:18:40 UTC (rev 4459)
@@ -3,8 +3,8 @@
 import java.util.Collection;
 
 import org.apache.commons.mail.Email;
-import org.jbpm.env.Environment;
+import org.jbpm.Execution;
 
 public interface MailProducer {
-	public Collection<Email> produce(final Environment env, final MailContext mailContext) throws Exception;
+	public Collection<Email> produce(final Execution exe, final MailContext mailContext) throws Exception;
 }
\ No newline at end of file

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java	2009-04-06 14:36:41 UTC (rev 4458)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java	2009-04-06 15:18:40 UTC (rev 4459)
@@ -3,6 +3,7 @@
 import java.util.Collection;
 
 import org.apache.commons.mail.Email;
+import org.jbpm.Execution;
 import org.jbpm.env.Environment;
 import org.jbpm.pvm.internal.email.producer.MailContext;
 import org.jbpm.pvm.internal.script.ScriptManager;
@@ -14,13 +15,13 @@
 	protected String language;
 	
 	@Override
-	public Collection<Email> produce(Environment env, MailContext mailContext)
+	public Collection<Email> produce(final Execution exe, final MailContext mailContext)
 			throws Exception {
 
 		ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
 		//TODO: Need to pass in execution rather than environment?
-		this.body = (String)scriptManager.evaluateScript(script, null, language);
+		this.body = (String)scriptManager.evaluateScript(script, exe, language);
 		
-		return super.produce(env, mailContext);
+		return super.produce(exe, mailContext);
 	}
 }

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java	2009-04-06 14:36:41 UTC (rev 4458)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java	2009-04-06 15:18:40 UTC (rev 4459)
@@ -8,6 +8,7 @@
 import org.apache.commons.mail.Email;
 import org.apache.commons.mail.EmailException;
 import org.apache.commons.mail.SimpleEmail;
+import org.jbpm.Execution;
 import org.jbpm.env.Environment;
 import org.jbpm.identity.Group;
 import org.jbpm.identity.User;
@@ -20,7 +21,7 @@
 	protected String body;
 	protected String subject;
 	
-	public Collection<Email> produce(final Environment env, final MailContext mailContext) throws Exception {
+	public Collection<Email> produce(final Execution exe, final MailContext mailContext) throws Exception {
 		//Create a simple email with the body set.
 		Email email = new SimpleEmail();