JBoss JBPM SVN: r4414 - 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 11:36:31 -0400 (Fri, 03 Apr 2009)
New Revision: 4414
Modified:
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java
Log:
Create new collection rather than edit current.
Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java 2009-04-03 15:30:53 UTC (rev 4413)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java 2009-04-03 15:36:31 UTC (rev 4414)
@@ -10,6 +10,6 @@
*
* @param addresses Email Addresses to filter.
*/
- public void filter(Collection<InternetAddress> addresses);
+ public Collection<InternetAddress> filter(final Collection<InternetAddress> addresses);
}
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 15:30:53 UTC (rev 4413)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java 2009-04-03 15:36:31 UTC (rev 4414)
@@ -17,21 +17,22 @@
private Collection<String> includePatterns;
private Collection<String> excludePatterns;
- public void filter(Collection<InternetAddress> addresses)
+ public Collection<InternetAddress> filter(final Collection<InternetAddress> addresses)
{
- Collection<InternetAddress> toRemove = new HashSet<InternetAddress>();
+ Collection<InternetAddress> filteredAddresses = new HashSet<InternetAddress>();
if(addresses!=null)
{
//Loop over for addresses to remove.
for(InternetAddress address : addresses)
{
- if(!keepAddress(address))
+ if(keepAddress(address))
{
- toRemove.add(address);
+ filteredAddresses.add(address);
}
}
- addresses.removeAll(toRemove);
}
+
+ return filteredAddresses;
}
/***
17 years
JBoss JBPM SVN: r4413 - 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 11:30:53 -0400 (Fri, 03 Apr 2009)
New Revision: 4413
Modified:
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java
Log:
Updated to remove repetitive code.
Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java 2009-04-03 15:07:44 UTC (rev 4412)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java 2009-04-03 15:30:53 UTC (rev 4413)
@@ -6,12 +6,10 @@
public interface AddressFilter {
/**
- * This method should remove addresses from to, cc, and bcc based on the filter implementation.
+ * This method should remove addresses based on the filter implementation.
*
- * @param to To addresses for the email.
- * @param cc CC addresses for the email.
- * @param bcc BCC addresses for the email.
+ * @param addresses Email Addresses to filter.
*/
- public void filter(Collection<InternetAddress> to, Collection<InternetAddress> cc, Collection<InternetAddress> bcc);
+ public void filter(Collection<InternetAddress> addresses);
}
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 15:07:44 UTC (rev 4412)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java 2009-04-03 15:30:53 UTC (rev 4413)
@@ -17,49 +17,21 @@
private Collection<String> includePatterns;
private Collection<String> excludePatterns;
- public void filter(Collection<InternetAddress> to, Collection<InternetAddress> cc, Collection<InternetAddress> bcc)
+ public void filter(Collection<InternetAddress> addresses)
{
Collection<InternetAddress> toRemove = new HashSet<InternetAddress>();
- if(to!=null)
+ if(addresses!=null)
{
//Loop over for addresses to remove.
- for(InternetAddress address : to)
+ for(InternetAddress address : addresses)
{
if(!keepAddress(address))
{
toRemove.add(address);
}
}
+ addresses.removeAll(toRemove);
}
-
- if(cc!=null)
- {
- //Loop over for addresses to remove.
- for(InternetAddress address : cc)
- {
- if(!keepAddress(address))
- {
- toRemove.add(address);
- }
- }
- }
-
- if(bcc!=null)
- {
- //Loop over for addresses to remove.
- for(InternetAddress address : bcc)
- {
- if(!keepAddress(address))
- {
- toRemove.add(address);
- }
- }
- }
-
- //Now remove all collected excludes.
- if(to!=null)to.removeAll(toRemove);
- if(cc!=null)cc.removeAll(toRemove);
- if(bcc!=null)bcc.removeAll(toRemove);
}
/***
17 years
JBoss JBPM SVN: r4412 - 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 11:07:44 -0400 (Fri, 03 Apr 2009)
New Revision: 4412
Modified:
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java
Log:
Added comments.
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 15:06:10 UTC (rev 4411)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java 2009-04-03 15:07:44 UTC (rev 4412)
@@ -6,7 +6,12 @@
import javax.mail.internet.InternetAddress;
-
+/**
+ * Allows filtering of to/cc/bcc recipient lists based on
+ * regular expressions for include and exclude patterns.
+ * @author Brad Davis
+ *
+ */
public abstract class WildCardAddressFilter implements AddressFilter {
private Collection<String> includePatterns;
17 years
JBoss JBPM SVN: r4411 - 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 11:06:10 -0400 (Fri, 03 Apr 2009)
New Revision: 4411
Modified:
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java
Log:
Added comments.
Modified: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java 2009-04-03 15:03:51 UTC (rev 4410)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java 2009-04-03 15:06:10 UTC (rev 4411)
@@ -6,7 +6,7 @@
public interface AddressFilter {
/**
- * This method should remove
+ * This method should remove addresses from to, cc, and bcc based on the filter implementation.
*
* @param to To addresses for the email.
* @param cc CC addresses for the email.
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 15:03:51 UTC (rev 4410)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java 2009-04-03 15:06:10 UTC (rev 4411)
@@ -57,6 +57,11 @@
if(bcc!=null)bcc.removeAll(toRemove);
}
+ /***
+ * Determine in a given address is included or excluded based on regex.
+ * @param address Email Address to validate against regex.
+ * @return If the includes is provided, and the address matches an include pattern, returns true, false otherwise.
+ */
private boolean keepAddress(InternetAddress address)
{
if(includePatterns!=null)
17 years
JBoss JBPM SVN: r4410 - in jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal: email and 1 other directories.
by do-not-reply＠jboss.org
Author: bradsdavis
Date: 2009-04-03 11:03:51 -0400 (Fri, 03 Apr 2009)
New Revision: 4410
Added:
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java
jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java
Log:
Added wild card REGEX filter.
Added: jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java
===================================================================
--- jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java (rev 0)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/AddressFilter.java 2009-04-03 15:03:51 UTC (rev 4410)
@@ -0,0 +1,17 @@
+package org.jbpm.pvm.internal.email.filter;
+
+import java.util.Collection;
+
+import javax.mail.internet.InternetAddress;
+
+public interface AddressFilter {
+ /**
+ * This method should remove
+ *
+ * @param to To addresses for the email.
+ * @param cc CC addresses for the email.
+ * @param bcc BCC addresses for the email.
+ */
+ public void filter(Collection<InternetAddress> to, Collection<InternetAddress> cc, Collection<InternetAddress> bcc);
+
+}
Added: 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 (rev 0)
+++ jbpm4/branches/email/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/filter/WildCardAddressFilter.java 2009-04-03 15:03:51 UTC (rev 4410)
@@ -0,0 +1,86 @@
+package org.jbpm.pvm.internal.email.filter;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.regex.Pattern;
+
+import javax.mail.internet.InternetAddress;
+
+
+public abstract class WildCardAddressFilter implements AddressFilter {
+
+ private Collection<String> includePatterns;
+ private Collection<String> excludePatterns;
+
+ public void filter(Collection<InternetAddress> to, Collection<InternetAddress> cc, Collection<InternetAddress> bcc)
+ {
+ Collection<InternetAddress> toRemove = new HashSet<InternetAddress>();
+ if(to!=null)
+ {
+ //Loop over for addresses to remove.
+ for(InternetAddress address : to)
+ {
+ if(!keepAddress(address))
+ {
+ toRemove.add(address);
+ }
+ }
+ }
+
+ if(cc!=null)
+ {
+ //Loop over for addresses to remove.
+ for(InternetAddress address : cc)
+ {
+ if(!keepAddress(address))
+ {
+ toRemove.add(address);
+ }
+ }
+ }
+
+ if(bcc!=null)
+ {
+ //Loop over for addresses to remove.
+ for(InternetAddress address : bcc)
+ {
+ if(!keepAddress(address))
+ {
+ toRemove.add(address);
+ }
+ }
+ }
+
+ //Now remove all collected excludes.
+ if(to!=null)to.removeAll(toRemove);
+ if(cc!=null)cc.removeAll(toRemove);
+ if(bcc!=null)bcc.removeAll(toRemove);
+ }
+
+ private boolean keepAddress(InternetAddress address)
+ {
+ if(includePatterns!=null)
+ {
+ for(String pattern : includePatterns)
+ {
+ if(Pattern.matches(pattern, address.toString()))
+ {
+ return true;
+ }
+ }
+ }
+ for(String pattern : excludePatterns)
+ {
+ if(Pattern.matches(pattern, address.toString()))
+ {
+ return false;
+ }
+ }
+ if(includePatterns==null||includePatterns.isEmpty())
+ {
+ //Includes were not set, which means if it wasn't excluded, include it.
+ return true;
+ }
+ return false;
+ }
+}
17 years
JBoss JBPM SVN: r4409 - jbpm4/branches.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-04-03 10:38:47 -0400 (Fri, 03 Apr 2009)
New Revision: 4409
Added:
jbpm4/branches/email/
Log:
create email branch
Copied: jbpm4/branches/email (from rev 4408, jbpm4/trunk)
17 years
JBoss JBPM SVN: r4408 - in jbpm4/trunk/modules: examples/src/test/resources and 3 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2009-04-03 09:18:00 -0400 (Fri, 03 Apr 2009)
New Revision: 4408
Modified:
jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.repository.hbm.xml
jbpm4/trunk/modules/examples/src/test/resources/jbpm.repository.hbm.xml
jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml
jbpm4/trunk/modules/pvm/src/test/resources/jbpm.repository.hbm.xml
jbpm4/trunk/modules/test-db/src/test/resources/jbpm.repository.hbm.xml
Log:
Use text fields for deployment.name: the 255 char limitation breaks with the deployment archive urls
Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.repository.hbm.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.repository.hbm.xml 2009-04-03 12:52:10 UTC (rev 4407)
+++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.repository.hbm.xml 2009-04-03 13:18:00 UTC (rev 4408)
@@ -12,7 +12,7 @@
<generator class="native" />
</id>
- <property name="name" column="NAME_" />
+ <property name="name" type="text" column="NAME_" />
<property name="timestamp" column="TIMESTAMP_" />
<map name="resources" cascade="all-delete-orphan">
Modified: jbpm4/trunk/modules/examples/src/test/resources/jbpm.repository.hbm.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/jbpm.repository.hbm.xml 2009-04-03 12:52:10 UTC (rev 4407)
+++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.repository.hbm.xml 2009-04-03 13:18:00 UTC (rev 4408)
@@ -12,7 +12,7 @@
<generator class="native" />
</id>
- <property name="name" column="NAME_" />
+ <property name="name" type="text" column="NAME_" />
<property name="timestamp" column="TIMESTAMP_" />
<map name="resources" cascade="all-delete-orphan">
Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml 2009-04-03 12:52:10 UTC (rev 4407)
+++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml 2009-04-03 13:18:00 UTC (rev 4408)
@@ -12,7 +12,7 @@
<generator class="native" />
</id>
- <property name="name" column="NAME_" />
+ <property name="name" type="text" column="NAME_" />
<property name="timestamp" column="TIMESTAMP_" />
<map name="resources" cascade="all-delete-orphan">
Modified: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.repository.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.repository.hbm.xml 2009-04-03 12:52:10 UTC (rev 4407)
+++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.repository.hbm.xml 2009-04-03 13:18:00 UTC (rev 4408)
@@ -12,7 +12,7 @@
<generator class="native" />
</id>
- <property name="name" column="NAME_" />
+ <property name="name" type="text" column="NAME_" />
<property name="timestamp" column="TIMESTAMP_" />
<map name="resources" cascade="all-delete-orphan">
Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.repository.hbm.xml
===================================================================
--- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.repository.hbm.xml 2009-04-03 12:52:10 UTC (rev 4407)
+++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.repository.hbm.xml 2009-04-03 13:18:00 UTC (rev 4408)
@@ -12,7 +12,7 @@
<generator class="native" />
</id>
- <property name="name" column="NAME_" />
+ <property name="name" type="text" column="NAME_" />
<property name="timestamp" column="TIMESTAMP_" />
<map name="resources" cascade="all-delete-orphan">
17 years
JBoss JBPM SVN: r4407 - in jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test: eventlistener and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-04-03 08:52:10 -0400 (Fri, 03 Apr 2009)
New Revision: 4407
Added:
jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/eventlistener/
jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java
Log:
adding first event listener test
Added: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java (rev 0)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java 2009-04-03 12:52:10 UTC (rev 4407)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.test.eventlistener;
+
+import org.jbpm.listener.EventListener;
+import org.jbpm.listener.EventListenerExecution;
+import org.jbpm.test.JbpmTestCase;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class EventListenerTest extends JbpmTestCase {
+
+ public static class ProcessEventRecorder implements EventListener {
+ private static final long serialVersionUID = 1L;
+ public void notify(EventListenerExecution execution) {
+ assertNull(execution.getActivity());
+ }
+ }
+
+ public void testProcessStart() {
+ deployJpdlXmlString(
+ "<process name='Insurance claim' key='ICL'>" +
+ " <on event='start'>" +
+ " <java class='"+ProcessEventRecorder.class.getName()+"' />" +
+ " </on>" +
+ " <start>" +
+ " <transition to='a' />" +
+ " </start>" +
+ " <state name='a' />" +
+ "</process>"
+ );
+ }
+
+}
Property changes on: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/eventlistener/EventListenerTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years
JBoss JBPM SVN: r4406 - jbpm4/branches.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-04-03 08:18:10 -0400 (Fri, 03 Apr 2009)
New Revision: 4406
Added:
jbpm4/branches/tbaeyens/
Log:
creating personal tbaeyens branch
Copied: jbpm4/branches/tbaeyens (from rev 4405, jbpm4/trunk)
17 years
JBoss JBPM SVN: r4405 - jbpm4/branches.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-04-03 08:16:17 -0400 (Fri, 03 Apr 2009)
New Revision: 4405
Removed:
jbpm4/branches/tbaeyens/
Log:
deleting personal tbaeyens branch
17 years