[jboss-svn-commits] JBL Code SVN: r22837 - in labs/jbossrules/trunk/drools-process: drools-process-task/src/main/resources/META-INF and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 17 03:10:16 EDT 2008
Author: mark.proctor at jboss.com
Date: 2008-09-17 03:10:16 -0400 (Wed, 17 Sep 2008)
New Revision: 22837
Added:
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/drools.email.conf
labs/jbossrules/trunk/drools-process/drools-workitems/src/main/resources/META-INF/
labs/jbossrules/trunk/drools-process/drools-workitems/src/main/resources/META-INF/drools.email.conf
Removed:
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/drools.client.conf
Modified:
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/SendIcal.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/drools.process.email.conf
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalTest.java
labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java
labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/email/SendHtml.java
labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/org/drools/process/workitem/email/EmailWorkItemHandlerTest.java
Log:
JBRULES-1745 WS-Human-Task
-Fixed test on email work item to use different port to 25.
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/SendIcal.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/SendIcal.java 2008-09-17 06:48:09 UTC (rev 22836)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/java/org/drools/task/service/SendIcal.java 2008-09-17 07:10:16 UTC (rev 22837)
@@ -70,16 +70,18 @@
// password = conf.getProperty( "password", null );
connection = new Properties();
-
+ connection.setProperty("mail.transport.protocol", "smtp");
+
if ( host != null && host.trim().length() > 0 ) {
- connection.put( "mail.smtp.host",
+ connection.setProperty( "mail.smtp.host",
host );
}
if ( port != null && port.trim().length() > 0 ) {
- connection.put( "mail.smtp.port",
- Integer.parseInt( port ) );
+ connection.setProperty( "mail.smtp.port",
+ port );
}
+
defaultLanguage = conf.getProperty( "defaultLanguage",
"en-UK" );
}
@@ -210,6 +212,7 @@
multipart.addBodyPart( messageBodyPart );
message.setContent( multipart );
+ message.saveChanges();
Transport.send( message );
}
Deleted: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/drools.client.conf
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/drools.client.conf 2008-09-17 06:48:09 UTC (rev 22836)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/drools.client.conf 2008-09-17 07:10:16 UTC (rev 22837)
@@ -1,8 +0,0 @@
-from = from at domain.com
-replyTo = replyTo at domain.com
-host = localhost
-#host = smtp.corp.redhat.com
-port = 2345
-defaultLanguage = en-UK
-#userName =
-#password =
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/drools.email.conf (from rev 22831, labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/drools.client.conf)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/drools.email.conf (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/drools.email.conf 2008-09-17 07:10:16 UTC (rev 22837)
@@ -0,0 +1,8 @@
+from = from at domain.com
+replyTo = replyTo at domain.com
+host = localhost
+#host = smtp.corp.redhat.com
+port = 2345
+defaultLanguage = en-UK
+#userName =
+#password =
\ No newline at end of file
Property changes on: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/drools.email.conf
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/drools.process.email.conf
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/drools.process.email.conf 2008-09-17 06:48:09 UTC (rev 22836)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/main/resources/META-INF/drools.process.email.conf 2008-09-17 07:10:16 UTC (rev 22837)
@@ -2,7 +2,7 @@
replyTo = replyTo at domain.com
host = localhost
#host = smtp.corp.redhat.com
-port = 25
+port = 2345
defaultLanguage = en-UK
#userName =
#password =
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalTest.java 2008-09-17 06:48:09 UTC (rev 22836)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/IcalTest.java 2008-09-17 07:10:16 UTC (rev 22837)
@@ -39,7 +39,7 @@
protected void setUp() throws Exception {
super.setUp();
- ChainedProperties props = new ChainedProperties( "client.conf" );
+ ChainedProperties props = new ChainedProperties( "process.email.conf" );
emailHost = props.getProperty( "host", "locahost" );
emailPort = props.getProperty( "port", "2345" );
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java 2008-09-17 06:48:09 UTC (rev 22836)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/src/test/java/org/drools/task/service/TaskServiceDeadlinesTest.java 2008-09-17 07:10:16 UTC (rev 22837)
@@ -54,7 +54,7 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- ChainedProperties props = new ChainedProperties( "client.conf" );
+ ChainedProperties props = new ChainedProperties( "process.email.conf" );
emailHost = props.getProperty( "host", "locahost" );
emailPort = props.getProperty( "port", "2345" );
@@ -92,7 +92,7 @@
vars.put( "now", new Date() );
DefaultEscalatedDeadlineHandler notificationHandler = new DefaultEscalatedDeadlineHandler();
- notificationHandler.getHandler().setConnection( "localhost", "25", null, null );
+ notificationHandler.getHandler().setConnection( emailHost, emailPort, null, null );
WorkItemManager manager = new DefaultWorkItemManager( null );
notificationHandler.setManager( manager );
Modified: labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/email/SendHtml.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/email/SendHtml.java 2008-09-17 06:48:09 UTC (rev 22836)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/email/SendHtml.java 2008-09-17 07:10:16 UTC (rev 22837)
@@ -38,9 +38,9 @@
Properties props = new Properties();
// XXX - could use Session.getTransport() and Transport.connect()
// XXX - assume we're using SMTP
- if ( mailhost != null && mailhost.trim().length() > 0 ) props.put( "mail.smtp.host", mailhost );
+ if ( mailhost != null && mailhost.trim().length() > 0 ) props.setProperty( "mail.smtp.host", mailhost );
if ( connection.getPort() != null && connection.getPort().trim().length() > 0 ) {
- props.put( "mail.smtp.port", Integer.parseInt( connection.getPort() ) );
+ props.setProperty( "mail.smtp.port", connection.getPort() );
}
// Get a Session object
Added: labs/jbossrules/trunk/drools-process/drools-workitems/src/main/resources/META-INF/drools.email.conf
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/src/main/resources/META-INF/drools.email.conf (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/src/main/resources/META-INF/drools.email.conf 2008-09-17 07:10:16 UTC (rev 22837)
@@ -0,0 +1,8 @@
+from = from at domain.com
+replyTo = replyTo at domain.com
+host = localhost
+#host = smtp.corp.redhat.com
+port = 2345
+defaultLanguage = en-UK
+#userName =
+#password =
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/org/drools/process/workitem/email/EmailWorkItemHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/org/drools/process/workitem/email/EmailWorkItemHandlerTest.java 2008-09-17 06:48:09 UTC (rev 22836)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/org/drools/process/workitem/email/EmailWorkItemHandlerTest.java 2008-09-17 07:10:16 UTC (rev 22837)
@@ -24,8 +24,8 @@
@Override
protected void setUp() throws Exception {
- ChainedProperties props = new ChainedProperties( "client.conf" );
- emailHost = props.getProperty( "host", "locahost" );
+ ChainedProperties props = new ChainedProperties( "email.conf" );
+ emailHost = props.getProperty( "host", "localhost" );
emailPort = props.getProperty( "port", "2345" );
wiser = new Wiser();
@@ -71,7 +71,7 @@
public void testSingleToWithSingleCCAndBCC() throws Exception {
EmailWorkItemHandler handler = new EmailWorkItemHandler();
- handler.setConnection( "localhost", "25", null, null );
+ handler.setConnection( emailHost, emailPort, null, null );
WorkItemImpl workItem = new WorkItemImpl();
workItem.setParameter( "To", "person1 at domain.com" );
@@ -127,7 +127,7 @@
public void testMultipleToWithSingleCCAndBCC() throws Exception {
EmailWorkItemHandler handler = new EmailWorkItemHandler();
- handler.setConnection( "localhost", "25", null, null );
+ handler.setConnection( emailHost, emailPort, null, null );
WorkItemImpl workItem = new WorkItemImpl();
workItem.setParameter( "To", "person1 at domain.com; person2 at domain.com" );
More information about the jboss-svn-commits
mailing list