[jbpm-commits] JBoss JBPM SVN: r4457 - 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 10:18:47 -0400 (Mon, 06 Apr 2009)
New Revision: 4457

Modified:
   jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.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:
Moved content based properties to producers.

Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java	2009-04-06 14:12:18 UTC (rev 4456)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/MailContext.java	2009-04-06 14:18:47 UTC (rev 4457)
@@ -8,15 +8,12 @@
 
 public class MailContext {
 
-	private String producerType;
 	private Collection<User> actors;
 	private Collection<Group> groups;
 	private Collection<String> toAddresses;
 	private Collection<String> ccAddresses;
 	private Collection<String> bccAddresses;
-	private Map<String, Object> keyValuePair;
-	private String subject;
-	private String body;
+
 	
 	public Collection<User> getActors() {
 		return actors;
@@ -48,29 +45,5 @@
 	public void setBccAddresses(Collection<String> bccAddresses) {
 		this.bccAddresses = bccAddresses;
 	}
-	public String getSubject() {
-		return subject;
-	}
-	public void setSubject(String subject) {
-		this.subject = subject;
-	}
-	public String getBody() {
-		return body;
-	}
-	public void setBody(String body) {
-		this.body = body;
-	}
-	public Map<String, Object> getKeyValuePair() {
-		return keyValuePair;
-	}
-	public void setKeyValuePair(Map<String, Object> keyValuePair) {
-		this.keyValuePair = keyValuePair;
-	}
-	public String getProducerType() {
-		return producerType;
-	}
-	public void setProducerType(String producerType) {
-		this.producerType = producerType;
-	}
 
 }

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:12:18 UTC (rev 4456)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/ScriptMailProducer.java	2009-04-06 14:18:47 UTC (rev 4457)
@@ -9,19 +9,18 @@
 
 
 public class ScriptMailProducer extends SimpleMailProducer {
+	
+	protected String script;
+	protected String language;
+	
 	@Override
 	public Collection<Email> produce(Environment env, MailContext mailContext)
 			throws Exception {
 
-		String script = (String)mailContext.getKeyValuePair().get("script");
-		String language = (String)mailContext.getKeyValuePair().get("language");
-		
 		ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
 		//TODO: Need to pass in execution rather than environment?
-		String body = (String)scriptManager.evaluateScript(script, null, language);
+		this.body = (String)scriptManager.evaluateScript(script, null, language);
 		
-		mailContext.setBody(body);
-		
 		return super.produce(env, 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:12:18 UTC (rev 4456)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/impl/SimpleMailProducer.java	2009-04-06 14:18:47 UTC (rev 4457)
@@ -17,6 +17,9 @@
 
 public class SimpleMailProducer implements MailProducer {
 
+	protected String body;
+	protected String subject;
+	
 	public Collection<Email> produce(final Environment env, final MailContext mailContext) throws Exception {
 		//Create a simple email with the body set.
 		Email email = new SimpleEmail();
@@ -25,8 +28,8 @@
 		populateAddresses(mailContext, email);
 
 		//Set subject and message.
-		email.setSubject(mailContext.getSubject());
-		email.setMsg(mailContext.getBody());
+		email.setSubject(subject);
+		email.setMsg(body);
 		
 		Collection<Email> emails = new HashSet<Email>();
 		emails.add(email);