[jbpm-commits] JBoss JBPM SVN: r3301 - in jbpm3/trunk: modules/distribution and 6 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Dec 9 16:41:52 EST 2008
Author: thomas.diesler at jboss.com
Date: 2008-12-09 16:41:52 -0500 (Tue, 09 Dec 2008)
New Revision: 3301
Added:
jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/TimerEntity.java
jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/TimerEntityHome.java
Modified:
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/trunk/modules/enterprise/jar/.project
jbpm3/trunk/modules/enterprise/jar/pom.xml
jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/RemoteCommandService.java
jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/RemoteCommandServiceHome.java
jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/TimerEntityBean.java
jbpm3/trunk/modules/enterprise/jar/src/main/resources/META-INF/ejb-jar.xml
jbpm3/trunk/pom.xml
Log:
decouple jsf-console from jbpm-enterprise.ear
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-12-09 21:40:49 UTC (rev 3300)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-12-09 21:41:52 UTC (rev 3301)
@@ -58,24 +58,18 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-enterprise-beans</artifactId>
+ <artifactId>jbpm-enterprise</artifactId>
<version>${version}</version>
<type>ejb</type>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-enterprise-beans</artifactId>
+ <artifactId>jbpm-enterprise</artifactId>
<classifier>config</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-enterprise-bundle</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </dependency>
- <dependency>
- <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-examples</artifactId>
<classifier>examples</classifier>
<version>${version}</version>
@@ -111,6 +105,11 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-userguide</artifactId>
<version>${version}</version>
<type>jdocbook</type>
Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-12-09 21:40:49 UTC (rev 3300)
+++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-12-09 21:41:52 UTC (rev 3301)
@@ -136,7 +136,6 @@
<mkdir dir="${izpack.temp.dir}" />
<!-- http://jira.codehaus.org/browse/IZPACK-151 -->
- <copy file="${deploy.artifacts.lib}/jbpm-enterprise-bundle.ear" tofile="${deploy.artifacts.lib}/jbpm-enterprise-bundle.zip" />
<copy file="${deploy.artifacts.lib}/jbpm-jpdl-config.jar" tofile="${deploy.artifacts.lib}/jbpm-jpdl-config.zip" />
<copy file="${deploy.artifacts.lib}/jbpm-userguide.jdocbook" tofile="${deploy.artifacts.lib}/jbpm-userguide.zip" />
Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-12-09 21:40:49 UTC (rev 3300)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-12-09 21:41:52 UTC (rev 3301)
@@ -46,7 +46,7 @@
<outputDirectory>resources/jbpm-enterprise-config</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:jbpm-enterprise-beans:jar:config</include>
+ <include>*:jbpm-enterprise:jar:config</include>
</includes>
<unpack>true</unpack>
</dependencySet>
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-09 21:40:49 UTC (rev 3300)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-12-09 21:41:52 UTC (rev 3301)
@@ -116,7 +116,7 @@
<file src="@{deploy.artifacts.dir}/etc/JBossORG-EULA.txt" targetdir="$INSTALL_PATH" override="true" />
<!-- jbpm3/config -->
- <file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-config.zip" targetdir="$INSTALL_PATH/config"
+ <file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config"
unpack="true" override="true" />
<file src="@{deploy.artifacts.dir}/etc/version.info.xml" targetdir="$INSTALL_PATH/config"
override="true" />
@@ -126,7 +126,7 @@
unpack="true" override="true" />
<!-- jbpm3/docs -->
- <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.zip" targetdir="$INSTALL_PATH/docs/userguide"
+ <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook" targetdir="$INSTALL_PATH/docs/userguide"
unpack="true" override="true" />
<file src="@{deploy.artifacts.dir}/etc/JBossORG-EULA.txt" targetdir="$INSTALL_PATH"
override="true" />
@@ -210,10 +210,14 @@
<file src="@{deploy.artifacts.dir}/lib/jbpm-identity-service.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
unpack="true" override="true" />
- <!-- jbpm/jbpm-enterprise.ear -->
- <file src="@{deploy.artifacts.dir}/lib/jbpm-enterprise-bundle.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise-bundle.ear"
+ <!-- jbpm/jbpm-enterprise.jar -->
+ <file src="@{deploy.artifacts.dir}/lib/jbpm-enterprise.jar" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar"
unpack="true" override="true" />
+ <!-- jbpm/jsf-console.war -->
+ <file src="@{deploy.artifacts.dir}/lib/jsf-console.war" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jsf-console.war"
+ unpack="true" override="true" />
+
<!-- jbpm/jbpm-userguide.war -->
<file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war"
unpack="true" override="true" />
Modified: jbpm3/trunk/modules/enterprise/jar/.project
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/.project 2008-12-09 21:40:49 UTC (rev 3300)
+++ jbpm3/trunk/modules/enterprise/jar/.project 2008-12-09 21:41:52 UTC (rev 3301)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbpm-enterprise-beans</name>
+ <name>jbpm-enterprise</name>
<comment></comment>
<projects>
</projects>
Modified: jbpm3/trunk/modules/enterprise/jar/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-12-09 21:40:49 UTC (rev 3300)
+++ jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-12-09 21:41:52 UTC (rev 3301)
@@ -13,16 +13,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <name>JBoss jBPM3 - Enterprise (JAR)</name>
+ <name>JBoss jBPM3 - Enterprise</name>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-enterprise-beans</artifactId>
+ <artifactId>jbpm-enterprise</artifactId>
<packaging>ejb</packaging>
<!-- Parent -->
<parent>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-enterprise</artifactId>
+ <artifactId>jbpm</artifactId>
<version>3.3.1-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
</parent>
<!-- Dependencies -->
Modified: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/RemoteCommandService.java
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/RemoteCommandService.java 2008-12-09 21:40:49 UTC (rev 3300)
+++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/RemoteCommandService.java 2008-12-09 21:41:52 UTC (rev 3301)
@@ -23,9 +23,11 @@
import java.rmi.RemoteException;
+import javax.ejb.EJBObject;
+
import org.jbpm.command.Command;
-public interface RemoteCommandService extends javax.ejb.EJBObject {
-
+public interface RemoteCommandService extends EJBObject
+{
public Object execute(Command command) throws RemoteException;
}
Modified: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/RemoteCommandServiceHome.java
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/RemoteCommandServiceHome.java 2008-12-09 21:40:49 UTC (rev 3300)
+++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/RemoteCommandServiceHome.java 2008-12-09 21:41:52 UTC (rev 3301)
@@ -24,9 +24,9 @@
import java.rmi.RemoteException;
import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
-public interface RemoteCommandServiceHome extends javax.ejb.EJBHome {
-
+public interface RemoteCommandServiceHome extends EJBHome
+{
public RemoteCommandService create() throws CreateException, RemoteException;
-
}
Added: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/TimerEntity.java
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/TimerEntity.java (rev 0)
+++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/TimerEntity.java 2008-12-09 21:41:52 UTC (rev 3301)
@@ -0,0 +1,21 @@
+package org.jbpm.ejb;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBObject;
+
+import org.jbpm.graph.exe.ProcessInstance;
+import org.jbpm.graph.exe.Token;
+import org.jbpm.job.Timer;
+
+public interface TimerEntity extends EJBObject
+{
+ public void createTimer(Timer timer) throws RemoteException;
+
+ public void cancelTimer(Timer timer) throws RemoteException;
+
+ public void cancelTimersByName(String timerName, Token token) throws RemoteException;
+
+ public void cancelTimersForProcessInstance(ProcessInstance processInstance) throws RemoteException;
+
+}
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/TimerEntity.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/TimerEntityHome.java
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/TimerEntityHome.java (rev 0)
+++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/TimerEntityHome.java 2008-12-09 21:41:52 UTC (rev 3301)
@@ -0,0 +1,19 @@
+package org.jbpm.ejb;
+
+import java.rmi.RemoteException;
+import java.util.Collection;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+import javax.ejb.FinderException;
+
+public interface TimerEntityHome extends EJBHome
+{
+ public TimerEntity create() throws CreateException, RemoteException;
+
+ public TimerEntity findByPrimaryKey(Long timerId) throws FinderException, RemoteException;
+
+ public Collection findByNameAndTokenId(String name, Long tokenId) throws FinderException, RemoteException;
+
+ public Collection findByProcessInstanceId(Long processInstanceId) throws FinderException, RemoteException;
+}
Property changes on: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/TimerEntityHome.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/TimerEntityBean.java
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/TimerEntityBean.java 2008-12-09 21:40:49 UTC (rev 3300)
+++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/TimerEntityBean.java 2008-12-09 21:41:52 UTC (rev 3301)
@@ -24,13 +24,13 @@
import org.jbpm.scheduler.ejbtimer.TimerInfo;
/**
- * Entity bean that interacts with the EJB timer service to schedule jBPM
- * {@linkplain Timer timers}.
+ * Entity bean that interacts with the EJB timer service to schedule jBPM {@linkplain Timer timers}.
*
* <h3>Environment</h3>
*
- * <p>The environment entries and resources available for customization are
- * summarized in the table below.</p>
+ * <p>
+ * The environment entries and resources available for customization are summarized in the table below.
+ * </p>
*
* <table border="1">
* <tr>
@@ -41,9 +41,7 @@
* <tr>
* <td><code>ejb/LocalCommandServiceBean</code></td>
* <td>EJB Reference</td>
- * <td>Link to the local {@linkplain CommandServiceBean session bean} that
- * executes timers on a separate jBPM context.
- * </td>
+ * <td>Link to the local {@linkplain CommandServiceBean session bean} that executes timers on a separate jBPM context.</td>
* </tr>
* </table>
*
@@ -51,145 +49,170 @@
* @author Alejandro Guizar
* @author Fady Matar
*/
-public abstract class TimerEntityBean implements EntityBean, TimedObject {
-
- private EntityContext entityContext;
+public abstract class TimerEntityBean implements EntityBean, TimedObject
+{
+ private EntityContext entityContext;
private LocalCommandService commandService;
private static final Log log = LogFactory.getLog(TimerEntityBean.class);
- public abstract Long getTimerId();
+ public abstract Long getTimerId();
- public abstract void setTimerId(Long timerId);
+ public abstract void setTimerId(Long timerId);
- public abstract String getName();
+ public abstract String getName();
- public abstract void setName(String name);
+ public abstract void setName(String name);
- public abstract Long getTokenId();
+ public abstract Long getTokenId();
- public abstract void setTokenId(Long tokenId);
+ public abstract void setTokenId(Long tokenId);
- public abstract Long getProcessInstanceId();
+ public abstract Long getProcessInstanceId();
- public abstract void setProcessInstanceId(Long processInstanceId);
+ public abstract void setProcessInstanceId(Long processInstanceId);
- public abstract String getDiscriminator();
+ public abstract String getDiscriminator();
- public abstract void setDiscriminator(String discriminator);
+ public abstract void setDiscriminator(String discriminator);
- public void ejbActivate() {
- try {
+ public void ejbActivate()
+ {
+ try
+ {
Context initial = new InitialContext();
- LocalCommandServiceHome commandServiceHome = (LocalCommandServiceHome) initial
- .lookup("java:comp/env/ejb/LocalCommandServiceBean");
+ LocalCommandServiceHome commandServiceHome = (LocalCommandServiceHome)initial.lookup("java:comp/env/ejb/LocalCommandServiceBean");
commandService = commandServiceHome.create();
}
- catch (NamingException e) {
+ catch (NamingException e)
+ {
throw new EJBException("failed to retrieve command service home", e);
}
- catch (CreateException e) {
+ catch (CreateException e)
+ {
throw new EJBException("command service creation failed", e);
}
- }
+ }
- public void ejbPassivate() {
- commandService = null;
- }
+ public void ejbPassivate()
+ {
+ commandService = null;
+ }
- public void ejbRemove() {
- commandService = null;
- }
+ public void ejbRemove()
+ {
+ commandService = null;
+ }
- public void ejbLoad() {}
+ public void ejbLoad()
+ {
+ }
- public void ejbStore() {}
+ public void ejbStore()
+ {
+ }
- public void setEntityContext(EntityContext entityContext) {
- this.entityContext = entityContext;
- }
+ public void setEntityContext(EntityContext entityContext)
+ {
+ this.entityContext = entityContext;
+ }
- public void unsetEntityContext() {
- entityContext = null;
- }
+ public void unsetEntityContext()
+ {
+ entityContext = null;
+ }
- /**
- * No ejbCreate operation is allowed. One approach of ensuring that an EJB is
- * set as read-only.
- *
- * @throws CreateException
- */
- public Long ejbCreate() throws CreateException {
- throw new CreateException("direct creation of timer entities is prohibited");
- }
+ /**
+ * No ejbCreate operation is allowed. One approach of ensuring that an EJB is set as read-only.
+ *
+ * @throws CreateException
+ */
+ public Long ejbCreate() throws CreateException
+ {
+ throw new CreateException("direct creation of timer entities is prohibited");
+ }
- public void ejbPostCreate() {}
+ public void ejbPostCreate()
+ {
+ }
- public void ejbTimeout(javax.ejb.Timer ejbTimer) {
- log.debug(ejbTimer + " fired");
- TimerInfo timerInfo = (TimerInfo) ejbTimer.getInfo();
- Timer timer = (Timer) commandService.execute(new ExecuteTimerCommand(timerInfo.getTimerId()));
- // if the timer has repeat
- if (timer.getRepeat() != null) {
- // create a new timer
- log.debug("scheduling timer for repeat on " + timer.getDueDate());
- createTimer(timer);
- }
- }
+ public void ejbTimeout(javax.ejb.Timer ejbTimer)
+ {
+ log.debug(ejbTimer + " fired");
+ TimerInfo timerInfo = (TimerInfo)ejbTimer.getInfo();
+ Timer timer = (Timer)commandService.execute(new ExecuteTimerCommand(timerInfo.getTimerId()));
+ // if the timer has repeat
+ if (timer.getRepeat() != null)
+ {
+ // create a new timer
+ log.debug("scheduling timer for repeat on " + timer.getDueDate());
+ createTimer(timer);
+ }
+ }
- public void createTimer(org.jbpm.job.Timer timer) {
- TimerService timerService = entityContext.getTimerService();
- javax.ejb.Timer ejbTimer = timerService.createTimer(timer.getDueDate(), new TimerInfo(timer));
- log.debug("created " + ejbTimer);
- }
+ public void createTimer(org.jbpm.job.Timer timer)
+ {
+ TimerService timerService = entityContext.getTimerService();
+ javax.ejb.Timer ejbTimer = timerService.createTimer(timer.getDueDate(), new TimerInfo(timer));
+ log.debug("created " + ejbTimer);
+ }
- public void cancelTimer(org.jbpm.job.Timer timer) {
- long timerId = timer.getId();
- Collection timers = entityContext.getTimerService().getTimers();
+ public void cancelTimer(org.jbpm.job.Timer timer)
+ {
+ long timerId = timer.getId();
+ Collection timers = entityContext.getTimerService().getTimers();
log.debug("retrieved " + timers.size() + " ejb timer(s) by id " + timerId);
int count = 0;
- for (Iterator i = timers.iterator(); i.hasNext();) {
- javax.ejb.Timer ejbTimer = (javax.ejb.Timer) i.next();
- TimerInfo timerInfo = (TimerInfo) ejbTimer.getInfo();
- if (timerInfo.getTimerId() == timerId) {
+ for (Iterator i = timers.iterator(); i.hasNext();)
+ {
+ javax.ejb.Timer ejbTimer = (javax.ejb.Timer)i.next();
+ TimerInfo timerInfo = (TimerInfo)ejbTimer.getInfo();
+ if (timerInfo.getTimerId() == timerId)
+ {
ejbTimer.cancel();
++count;
}
- }
- log.debug("canceled " + count + " ejb timer(s) by id " + timerId);
- }
+ }
+ log.debug("canceled " + count + " ejb timer(s) by id " + timerId);
+ }
- public void cancelTimersByName(String timerName, Token token) {
- Collection timers = entityContext.getTimerService().getTimers();
- log.debug("retrieved " + timers.size() + " ejb timer(s) by name '" + timerName + "' for " + token);
+ public void cancelTimersByName(String timerName, Token token)
+ {
+ Collection timers = entityContext.getTimerService().getTimers();
+ log.debug("retrieved " + timers.size() + " ejb timer(s) by name '" + timerName + "' for " + token);
- int count = 0;
- for (Iterator i = timers.iterator(); i.hasNext();) {
- javax.ejb.Timer ejbTimer = (javax.ejb.Timer) i.next();
- TimerInfo timerInfo = (TimerInfo) ejbTimer.getInfo();
- if (timerInfo.matchesName(timerName, token)) {
- ejbTimer.cancel();
- ++count;
- }
- }
- log.debug("canceled " + count + " ejb timer(s) by name '" + timerName + "' for " + token);
- }
+ int count = 0;
+ for (Iterator i = timers.iterator(); i.hasNext();)
+ {
+ javax.ejb.Timer ejbTimer = (javax.ejb.Timer)i.next();
+ TimerInfo timerInfo = (TimerInfo)ejbTimer.getInfo();
+ if (timerInfo.matchesName(timerName, token))
+ {
+ ejbTimer.cancel();
+ ++count;
+ }
+ }
+ log.debug("canceled " + count + " ejb timer(s) by name '" + timerName + "' for " + token);
+ }
- public void cancelTimersForProcessInstance(ProcessInstance processInstance) {
- Collection timers = entityContext.getTimerService().getTimers();
- log.debug("retrieved " + timers.size() + " timer(s) for " + processInstance);
+ public void cancelTimersForProcessInstance(ProcessInstance processInstance)
+ {
+ Collection timers = entityContext.getTimerService().getTimers();
+ log.debug("retrieved " + timers.size() + " timer(s) for " + processInstance);
- int count = 0;
- for (Iterator i = timers.iterator(); i.hasNext();) {
- javax.ejb.Timer ejbTimer = (javax.ejb.Timer) i.next();
- TimerInfo timerInfo = (TimerInfo) ejbTimer.getInfo();
- if (timerInfo.matchesProcessInstance(processInstance)) {
- ejbTimer.cancel();
- ++count;
- }
- }
- log.debug("canceled " + count + " ejb timer(s) for " + processInstance);
- }
+ int count = 0;
+ for (Iterator i = timers.iterator(); i.hasNext();)
+ {
+ javax.ejb.Timer ejbTimer = (javax.ejb.Timer)i.next();
+ TimerInfo timerInfo = (TimerInfo)ejbTimer.getInfo();
+ if (timerInfo.matchesProcessInstance(processInstance))
+ {
+ ejbTimer.cancel();
+ ++count;
+ }
+ }
+ log.debug("canceled " + count + " ejb timer(s) for " + processInstance);
+ }
}
Modified: jbpm3/trunk/modules/enterprise/jar/src/main/resources/META-INF/ejb-jar.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/src/main/resources/META-INF/ejb-jar.xml 2008-12-09 21:40:49 UTC (rev 3300)
+++ jbpm3/trunk/modules/enterprise/jar/src/main/resources/META-INF/ejb-jar.xml 2008-12-09 21:41:52 UTC (rev 3301)
@@ -224,6 +224,8 @@
<description>Interacts with the EJB timer service to schedule jBPM timers.</description>
<display-name>jBPM Timer Entity Bean</display-name>
<ejb-name>TimerEntityBean</ejb-name>
+ <home>org.jbpm.ejb.TimerEntityHome</home>
+ <remote>org.jbpm.ejb.TimerEntity</remote>
<local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home>
<local>org.jbpm.ejb.LocalTimerEntity</local>
<ejb-class>org.jbpm.ejb.impl.TimerEntityBean</ejb-class>
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-12-09 21:40:49 UTC (rev 3300)
+++ jbpm3/trunk/pom.xml 2008-12-09 21:41:52 UTC (rev 3301)
@@ -31,7 +31,7 @@
<module>modules/core</module>
<module>modules/db</module>
<module>modules/identity</module>
- <module>modules/enterprise</module>
+ <module>modules/enterprise/jar</module>
<module>modules/examples</module>
<module>modules/simulation</module>
<module>modules/integration</module>
@@ -70,7 +70,7 @@
<jaxen.version>1.1.1</jaxen.version>
<jbpm.designer.version>3.1.5</jbpm.designer.version>
<jbpm.gwt-console.version>1.0.0-SNAPSHOT</jbpm.gwt-console.version>
- <jbpm.jsf-console.version>3.3.0.GA</jbpm.jsf-console.version>
+ <jbpm.jsf-console.version>3.3.1-SNAPSHOT</jbpm.jsf-console.version>
<jboss.bpm.spec.version>1.0.0-SNAPSHOT</jboss.bpm.spec.version>
<jboss.client.version>4.2.2.GA</jboss.client.version>
<jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
More information about the jbpm-commits
mailing list