JBoss JBPM SVN: r4434 - jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2009-04-03 15:50:44 -0400 (Fri, 03 Apr 2009)
New Revision: 4434
Modified:
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java
Log:
Added basic way of getting at members of groups.
Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java 2009-04-03 19:47:50 UTC (rev 4433)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java 2009-04-03 19:50:44 UTC (rev 4434)
@@ -13,8 +13,13 @@
public Collection<InternetAddress> resolveGroupAddresses(Group group) {
Collection<InternetAddress> addresses = new HashSet<InternetAddress>();
- //Could be a group address... otherwise look up all users.
-
+ org.jbpm.pvm.internal.identity.spi.IdentitySession session = null;
+ //TODO: Optimize this, or it could be a N+1 select.
+ Collection<User> users = session.findUsersByGroup(group.getId());
+ for(User u : users)
+ {
+ addresses.add(resolveUserAddress(u));
+ }
return addresses;
}
17 years
JBoss JBPM SVN: r4433 - in jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email: resolver and 1 other directories.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2009-04-03 15:47:50 -0400 (Fri, 03 Apr 2009)
New Revision: 4433
Added:
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java
Modified:
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/SimpleMailProducer.java
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java
Log:
Removed @Override for methods implementing interfaces. This is reserved for Java 6.
Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/SimpleMailProducer.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/SimpleMailProducer.java 2009-04-03 19:30:09 UTC (rev 4432)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/producer/SimpleMailProducer.java 2009-04-03 19:47:50 UTC (rev 4433)
@@ -15,7 +15,6 @@
public class SimpleMailProducer implements MailProducer {
- @Override
public Collection<Email> produce(final Environment env, final MailContext mailContext) throws Exception {
//Create a simple email with the body set.
Email email = new SimpleEmail();
@@ -57,7 +56,7 @@
for(User user : mailContext.getActors())
{
InternetAddress address = resolver.resolveUserAddress(user);
- email.addTo(address.getAddress(), user.getFamilyName()+", "+user.getGivenName());
+ email.addTo(address.getAddress(), this.constructName(user));
}
for(Group group : mailContext.getGroups())
{
@@ -68,5 +67,27 @@
}
}
}
+
+ protected String constructName(User user)
+ {
+ String name = null;
+ if(user.getGivenName()!=null&&!user.getGivenName().isEmpty())
+ {
+ name = user.getGivenName();
+ }
+ if(user.getFamilyName()!=null&&!user.getFamilyName().isEmpty())
+ {
+ if(name==null)
+ {
+ name = user.getFamilyName();
+ }
+ else
+ {
+ name += " "+user.getFamilyName();
+ }
+ }
+
+ return name;
+ }
}
Added: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java (rev 0)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/resolver/IdentityAddressResolver.java 2009-04-03 19:47:50 UTC (rev 4433)
@@ -0,0 +1,26 @@
+package org.jbpm.pvm.internal.email.resolver;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+import javax.mail.internet.InternetAddress;
+
+import org.jbpm.identity.Group;
+import org.jbpm.identity.User;
+
+public class IdentityAddressResolver implements AddressResolver {
+
+ public Collection<InternetAddress> resolveGroupAddresses(Group group) {
+ Collection<InternetAddress> addresses = new HashSet<InternetAddress>();
+
+ //Could be a group address... otherwise look up all users.
+
+ return addresses;
+ }
+
+ public InternetAddress resolveUserAddress(User user) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java 2009-04-03 19:30:09 UTC (rev 4432)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java 2009-04-03 19:47:50 UTC (rev 4433)
@@ -21,7 +21,6 @@
Collection<MailServerConfiguration> serverConfigs;
- @Override
public void send(Collection<Email> emails) {
//Emails need to have the sessions populated.
17 years
JBoss JBPM SVN: r4432 - jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-04-03 15:30:09 -0400 (Fri, 03 Apr 2009)
New Revision: 4432
Modified:
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml
Log:
revert ProcessStateLog mapping file, should not have taken out that foreign-key="none"
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml 2009-04-03 19:15:40 UTC (rev 4431)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml 2009-04-03 19:30:09 UTC (rev 4432)
@@ -11,7 +11,8 @@
discriminator-value="Z">
<many-to-one name="subProcessInstance"
- column="NEWLONGVALUE_" />
+ column="NEWLONGVALUE_"
+ foreign-key="none" />
</subclass>
</hibernate-mapping>
17 years
JBoss JBPM SVN: r4431 - jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2009-04-03 15:15:40 -0400 (Fri, 03 Apr 2009)
New Revision: 4431
Modified:
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java
Log:
Added setter methods for patterns.
Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java 2009-04-03 19:12:34 UTC (rev 4430)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java 2009-04-03 19:15:40 UTC (rev 4431)
@@ -65,4 +65,12 @@
}
return false;
}
+
+ public void setIncludePatterns(Collection<String> includePatterns) {
+ this.includePatterns = includePatterns;
+ }
+
+ public void setExcludePatterns(Collection<String> excludePatterns) {
+ this.excludePatterns = excludePatterns;
+ }
}
17 years
JBoss JBPM SVN: r4430 - jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2009-04-03 15:12:34 -0400 (Fri, 03 Apr 2009)
New Revision: 4430
Modified:
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java
Log:
Using new commons email snapshot methods for accessing addresses.
Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java 2009-04-03 19:11:55 UTC (rev 4429)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java 2009-04-03 19:12:34 UTC (rev 4430)
@@ -27,41 +27,10 @@
//Emails need to have the sessions populated.
for(Email email : emails)
{
- Collection<InternetAddress> to = new HashSet<InternetAddress>();
- Collection<InternetAddress> cc = new HashSet<InternetAddress>();
- Collection<InternetAddress> bcc = new HashSet<InternetAddress>();
-
- MimeMessage message = email.getMimeMessage();
- try {
- for(Address addr : Arrays.asList(message.getRecipients(RecipientType.TO)))
- {
- if(addr instanceof InternetAddress)
- {
- to.add((InternetAddress)addr);
- }
- }
- for(Address addr : Arrays.asList(message.getRecipients(RecipientType.CC)))
- {
- if(addr instanceof InternetAddress)
- {
- cc.add((InternetAddress)addr);
- }
- }
- for(Address addr : Arrays.asList(message.getRecipients(RecipientType.BCC)))
- {
- if(addr instanceof InternetAddress)
- {
- bcc.add((InternetAddress)addr);
- }
- }
-
- }
- catch(MessagingException e)
- {
-
- }
-
-
+ Collection<InternetAddress> to = email.getToAddresses();
+ Collection<InternetAddress> cc = email.getCcAddresses();
+ Collection<InternetAddress> bcc = email.getBccAddresses();
+
for(MailServerConfiguration config : serverConfigs)
{
AddressFilter addressFilter = config.getFilter();
17 years
JBoss JBPM SVN: r4429 - jbpm4/branches/email/modules/pvm.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2009-04-03 15:11:55 -0400 (Fri, 03 Apr 2009)
New Revision: 4429
Modified:
jbpm4/branches/email/modules/pvm/pom.xml
Log:
Updated to use commons email 1.2 snapshot.
Modified: jbpm4/branches/email/modules/pvm/pom.xml
===================================================================
--- jbpm4/branches/email/modules/pvm/pom.xml 2009-04-03 17:38:06 UTC (rev 4428)
+++ jbpm4/branches/email/modules/pvm/pom.xml 2009-04-03 19:11:55 UTC (rev 4429)
@@ -33,6 +33,13 @@
<table.prefix>JBPM_</table.prefix>
<!--test.resources.directory>${project.build.directory}/test-resources</test.resources.directory-->
</properties>
+ <repositories>
+ <repository>
+ <id>Snapshot</id>
+ <name>JBoss Snapshot</name>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ </repository>
+ </repositories>
<!-- Dependencies -->
<dependencies>
@@ -112,7 +119,7 @@
<dependency>
<groupId>commons-email</groupId>
<artifactId>commons-email</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
17 years
JBoss JBPM SVN: r4428 - jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2009-04-03 13:38:06 -0400 (Fri, 03 Apr 2009)
New Revision: 4428
Modified:
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java
Log:
Fixed unused imports.
Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java 2009-04-03 17:37:31 UTC (rev 4427)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java 2009-04-03 17:38:06 UTC (rev 4428)
@@ -2,7 +2,6 @@
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashSet;
import javax.mail.Address;
17 years
JBoss JBPM SVN: r4427 - jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2009-04-03 13:37:31 -0400 (Fri, 03 Apr 2009)
New Revision: 4427
Modified:
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java
Log:
Added code to split out the to/cc/bcc over the filter.
Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java 2009-04-03 17:19:24 UTC (rev 4426)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/service/SynchronousMailService.java 2009-04-03 17:37:31 UTC (rev 4427)
@@ -1,8 +1,16 @@
package org.jbpm.pvm.internal.email.service;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import javax.mail.Address;
+import javax.mail.MessagingException;
import javax.mail.Session;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMessage.RecipientType;
import org.apache.commons.mail.Email;
import org.apache.commons.mail.EmailException;
@@ -16,13 +24,48 @@
@Override
public void send(Collection<Email> emails) {
-
+
//Emails need to have the sessions populated.
for(Email email : emails)
{
+ Collection<InternetAddress> to = new HashSet<InternetAddress>();
+ Collection<InternetAddress> cc = new HashSet<InternetAddress>();
+ Collection<InternetAddress> bcc = new HashSet<InternetAddress>();
+
+ MimeMessage message = email.getMimeMessage();
+ try {
+ for(Address addr : Arrays.asList(message.getRecipients(RecipientType.TO)))
+ {
+ if(addr instanceof InternetAddress)
+ {
+ to.add((InternetAddress)addr);
+ }
+ }
+ for(Address addr : Arrays.asList(message.getRecipients(RecipientType.CC)))
+ {
+ if(addr instanceof InternetAddress)
+ {
+ cc.add((InternetAddress)addr);
+ }
+ }
+ for(Address addr : Arrays.asList(message.getRecipients(RecipientType.BCC)))
+ {
+ if(addr instanceof InternetAddress)
+ {
+ bcc.add((InternetAddress)addr);
+ }
+ }
+
+ }
+ catch(MessagingException e)
+ {
+
+ }
+
+
for(MailServerConfiguration config : serverConfigs)
{
- AddressFilter filter = config.getFilter();
+ AddressFilter addressFilter = config.getFilter();
SmtpServer server = config.getServer();
if(server!=null)
@@ -32,7 +75,22 @@
//Need to apply filter.
try {
- email.send();
+ Collection<InternetAddress> toFiltered = addressFilter.filter(to);
+ Collection<InternetAddress> ccFiltered = addressFilter.filter(cc);
+ Collection<InternetAddress> bccFiltered = addressFilter.filter(bcc);
+
+ //Set the email with the new filtered addresses.
+ email.setTo(toFiltered);
+ email.setCc(ccFiltered);
+ email.setBcc(bccFiltered);
+
+ //If there is someone to send it to, then send it.
+ if((toFiltered!=null&&!toFiltered.isEmpty())||
+ (ccFiltered!=null&&!ccFiltered.isEmpty())||
+ (bccFiltered!=null&&!bccFiltered.isEmpty()))
+ {
+ email.send();
+ }
}
catch(EmailException e)
{
17 years
JBoss JBPM SVN: r4426 - in jbpm3/branches/jbpm-3.2.5.SP/hudson: hudson-home/jobs/jBPM3-Container-Matrix and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-04-03 13:19:24 -0400 (Fri, 03 Apr 2009)
New Revision: 4426
Modified:
jbpm3/branches/jbpm-3.2.5.SP/hudson/ant.properties.example
jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml
Log:
update hudson version
Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/ant.properties.example
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/hudson/ant.properties.example 2009-04-03 17:19:05 UTC (rev 4425)
+++ jbpm3/branches/jbpm-3.2.5.SP/hudson/ant.properties.example 2009-04-03 17:19:24 UTC (rev 4426)
@@ -35,6 +35,6 @@
hudson.mail.recipients=
hudson.smtp.host=localhost
-# Hudson (1.262)
+# Hudson (1.295)
apache-tomcat=5.5.20
-sun-hudson=2402/117036
+sun-hudson=2402/131374
Modified: jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-04-03 17:19:05 UTC (rev 4425)
+++ jbpm3/branches/jbpm-3.2.5.SP/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-04-03 17:19:24 UTC (rev 4426)
@@ -27,7 +27,7 @@
<disabled>false</disabled>
<triggers class="vector">
<hudson.triggers.TimerTrigger>
- <spec>0 0 * * *</spec>
+ <spec>0 2 * * *</spec>
</hudson.triggers.TimerTrigger>
</triggers>
<axes>
17 years
JBoss JBPM SVN: r4425 - in jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm: graph/log and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-04-03 13:19:05 -0400 (Fri, 03 Apr 2009)
New Revision: 4425
Modified:
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml
jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml
Log:
[JBPM-2094] fix duplicate key name 'FK_LOG_ACTION' -
some indexes were mistakenly named 'FK_*' instead of 'IDX_*'
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml 2009-04-03 16:28:22 UTC (rev 4424)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml 2009-04-03 17:19:05 UTC (rev 4425)
@@ -14,7 +14,7 @@
column="VARIABLEINSTANCE_"
cascade="save-update"
foreign-key="FK_LOG_VARINST"
- index="FK_LOG_VARINST" />
+ index="IDX_LOG_VARINST" />
</subclass>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml 2009-04-03 16:28:22 UTC (rev 4424)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml 2009-04-03 17:19:05 UTC (rev 4425)
@@ -15,7 +15,7 @@
<many-to-one name="action"
column="ACTION_"
foreign-key="FK_LOG_ACTION"
- index="FK_LOG_ACTION" />
+ index="IDX_LOG_ACTION" />
</subclass>
</hibernate-mapping>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml 2009-04-03 16:28:22 UTC (rev 4424)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml 2009-04-03 17:19:05 UTC (rev 4425)
@@ -15,7 +15,7 @@
<many-to-one name="action"
column="ACTION_"
foreign-key="FK_LOG_ACTION"
- index="FK_LOG_ACTION" />
+ index="IDX_LOG_ACTION" />
</subclass>
</hibernate-mapping>
Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml
===================================================================
--- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml 2009-04-03 16:28:22 UTC (rev 4424)
+++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml 2009-04-03 17:19:05 UTC (rev 4425)
@@ -11,8 +11,7 @@
discriminator-value="Z">
<many-to-one name="subProcessInstance"
- column="NEWLONGVALUE_"
- foreign-key="none" />
+ column="NEWLONGVALUE_" />
</subclass>
</hibernate-mapping>
17 years