October 2008 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r2620 - jbpm3/trunk/modules/core.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-10-25 10:35:37 -0400 (Sat, 25 Oct 2008) New Revision: 2620 Modified: jbpm3/trunk/modules/core/pom.xml Log: [JBPM-1709] include JmsMessageTest Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2008-10-25 12:50:13 UTC (rev 2619) +++ jbpm3/trunk/modules/core/pom.xml 2008-10-25 14:35:37 UTC (rev 2620) @@ -214,8 +214,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> -  - <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>  <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> @@ -251,8 +249,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> -  - <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>  <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> @@ -288,8 +284,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> -  - <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>  <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> @@ -327,8 +321,6 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> -  - <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>  <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude>

17 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r2619 - jbpm3/trunk/modules/core.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-10-25 08:50:13 -0400 (Sat, 25 Oct 2008) New Revision: 2619 Modified: jbpm3/trunk/modules/core/pom.xml Log: slf4j-api scope provided Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2008-10-25 12:44:55 UTC (rev 2618) +++ jbpm3/trunk/modules/core/pom.xml 2008-10-25 12:50:13 UTC (rev 2619) @@ -91,6 +91,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency>

17 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r2618 - jbpm3/trunk/modules/core.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-10-25 08:44:55 -0400 (Sat, 25 Oct 2008) New Revision: 2618 Modified: jbpm3/trunk/modules/core/pom.xml Log: [JBPM-1709] exclude JmsMessageTest Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2008-10-25 01:14:15 UTC (rev 2617) +++ jbpm3/trunk/modules/core/pom.xml 2008-10-25 12:44:55 UTC (rev 2618) @@ -213,6 +213,8 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> +  + <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>  <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> @@ -248,6 +250,8 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> +  + <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>  <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> @@ -283,6 +287,8 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> +  + <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>  <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude> @@ -320,6 +326,8 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> +  + <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>  <exclude>org/jbpm/job/executor/JobLoadJoinTest.java</exclude> <exclude>org/jbpm/job/executor/JobLoadSubProcessTest.java</exclude>

17 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r2617 - in jbpm3/trunk: modules/enterprise/jar and 9 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-10-24 21:14:15 -0400 (Fri, 24 Oct 2008) New Revision: 2617 Added: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobsCommand.java jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageService.java jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactory.java Modified: jbpm3/trunk/modules/enterprise/jar/pom.xml jbpm3/trunk/modules/enterprise/jar/src/main/etc/jbpm.cfg.xml jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/CommandServiceBean.java jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactoryImpl.java jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageServiceImpl.java jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/scheduler/ejbtimer/EntitySchedulerService.java jbpm3/trunk/modules/enterprise/jar/src/main/resources/META-INF/ejb-jar.xml jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/AppServerConfigurationsTest.java jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/msg/jms/JmsMessageTest.java jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java jbpm3/trunk/modules/userguide/src/main/docbook/en/modules/enterprise.xml jbpm3/trunk/pom.xml Log: [JBPM-1709] completed exclusive job support, still need to iron some wrinkles Modified: jbpm3/trunk/modules/enterprise/jar/pom.xml =================================================================== --- jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-10-25 01:08:36 UTC (rev 2616) +++ jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-10-25 01:14:15 UTC (rev 2617) @@ -174,18 +174,6 @@ </excludes> </configuration> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - <excludes> -  -  -  -  - </excludes> - </configuration> - </plugin> </plugins> </build> @@ -234,16 +222,57 @@ <name>log4j.output.dir</name> <value>${basedir}/target</value> </property> - <property> - <name>datasource.xa</name> - <value>${datasource.xa}</value> - </property> </systemProperties> </configuration> </plugin> </plugins> </build> </profile> + <profile> + <id>no-xa-datasource</id> + <activation> + <property> + <name>!datasource.xa</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> +  + <exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude> +  + <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>xa-datasource</id> + <activation> + <property> + <name>datasource.xa</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> +  + <exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude> +  + <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> - </project> Modified: jbpm3/trunk/modules/enterprise/jar/src/main/etc/jbpm.cfg.xml =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/main/etc/jbpm.cfg.xml 2008-10-25 01:08:36 UTC (rev 2616) +++ jbpm3/trunk/modules/enterprise/jar/src/main/etc/jbpm.cfg.xml 2008-10-25 01:14:15 UTC (rev 2617) @@ -2,7 +2,7 @@ <jbpm-context> <service name="persistence" factory="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory" /> - <service name="message" factory="org.jbpm.msg.jms.JmsMessageServiceFactoryImpl" /> + <service name="message" factory="org.jbpm.msg.jms.JmsMessageServiceFactory" /> <service name="scheduler" factory="org.jbpm.scheduler.ejbtimer.EntitySchedulerServiceFactory" /> <service name="tx" factory="org.jbpm.tx.TxServiceFactory" /> <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" /> Modified: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/CommandServiceBean.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/CommandServiceBean.java 2008-10-25 01:08:36 UTC (rev 2616) +++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/CommandServiceBean.java 2008-10-25 01:14:15 UTC (rev 2617) @@ -35,7 +35,7 @@ import org.jbpm.JbpmException; import org.jbpm.command.Command; import org.jbpm.command.CommandService; -import org.jbpm.msg.jms.JmsMessageServiceFactoryImpl; +import org.jbpm.msg.jms.JmsMessageServiceFactory; import org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory; /** @@ -83,7 +83,7 @@ * <td><code>jms/JbpmConnectionFactory</code></td> * <td>Resource Manager Reference</td> * <td>Logical name of the factory that provides JMS connections to the - * {@linkplain JmsMessageServiceFactoryImpl message service}. Required for + * {@linkplain JmsMessageServiceFactory message service}. Required for * processes that contain asynchronous continuations. * </td> * </tr> Modified: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java 2008-10-25 01:08:36 UTC (rev 2616) +++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java 2008-10-25 01:14:15 UTC (rev 2617) @@ -1,3 +1,24 @@ +/* + * 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.ejb.impl; import java.io.PrintWriter; @@ -2,5 +23,11 @@ import java.io.StringWriter; -import java.util.Iterator; import java.util.List; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.naming.NamingException; + import org.apache.commons.logging.Log; @@ -11,7 +38,14 @@ import org.jbpm.JbpmContext; import org.jbpm.command.Command; import org.jbpm.job.Job; +import org.jbpm.msg.jms.JmsMessageService; +import org.jbpm.msg.jms.JmsMessageServiceFactory; +import org.jbpm.svc.Services; +/** + * Individual job processing command. + * @author Alejandro Guizar + */ public class ExecuteJobCommand implements Command { private final long jobId; @@ -31,25 +65,28 @@ if (job.isExclusive()) { // acquire exclusive jobs List exclusiveJobs = jbpmContext.getSession().createCriteria(Job.class) - .add(Restrictions.isNull("lockMode")) - .add(Restrictions.eq("processInstance", job.getProcessInstance())) - .list(); + .add(Restrictions.isNull("lockMode")) + .add(Restrictions.eq("processInstance", job.getProcessInstance())) + .list(); String lockOwner = Long.toString(jobId); - for (Iterator i = exclusiveJobs.iterator(); i.hasNext();) { - Job exclusiveJob = (Job) i.next(); + long[] exclusiveJobIds = new long[exclusiveJobs.size()]; + for (int i = 0; i < exclusiveJobIds.length; i++) { + Job exclusiveJob = (Job) exclusiveJobs.get(i); exclusiveJob.setLockOwner(lockOwner); + exclusiveJobIds[i] = exclusiveJob.getId(); } // execute exclusive jobs in separate transaction - + executeJobs(jbpmContext, exclusiveJobIds); } else { - executeJob(job, jbpmContext); + executeJob(job, jbpmContext); } - return job; + return null; } - private static void executeJob(Job job, JbpmContext jbpmContext) { - job.setLockOwner(ExecuteJobCommand.class.getName()); // prevent others from removing job + static void executeJob(Job job, JbpmContext jbpmContext) { + // prevent others from removing job + job.setLockOwner(ExecuteJobCommand.class.getName()); log.debug("executing " + job); try { if (job.execute(jbpmContext)) { @@ -70,5 +107,24 @@ } } + private static void executeJobs(JbpmContext jbpmContext, long[] exclusiveJobIds) + throws NamingException, JMSException { + Services services = jbpmContext.getServices(); + JmsMessageServiceFactory messageServiceFactory = (JmsMessageServiceFactory) services.getServiceFactory(Services.SERVICENAME_MESSAGE); + Destination destination = messageServiceFactory.getCommandDestination(); + + JmsMessageService messageService = (JmsMessageService) services.getMessageService(); + Session session = messageService.getSession(); + MessageProducer producer = session.createProducer(destination); + try { + Command command = new ExecuteJobsCommand(exclusiveJobIds); + Message message = session.createObjectMessage(command); + producer.send(message); + } + finally { + producer.close(); + } + } + private static Log log = LogFactory.getLog(ExecuteJobCommand.class); } Added: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobsCommand.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobsCommand.java (rev 0) +++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobsCommand.java 2008-10-25 01:14:15 UTC (rev 2617) @@ -0,0 +1,51 @@ +/* + * 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.ejb.impl; + +import org.jbpm.JbpmContext; +import org.jbpm.command.Command; +import org.jbpm.db.JobSession; +import org.jbpm.job.Job; + +/** + * Batch job processing command. + * @author Alejandro Guizar + */ +public class ExecuteJobsCommand implements Command { + + private long[] jobIds; + private static final long serialVersionUID = 1L; + + public ExecuteJobsCommand(long[] jobIds) { + this.jobIds = jobIds; + } + + public Object execute(JbpmContext jbpmContext) throws Exception { + JobSession jobSession = jbpmContext.getJobSession(); + for (int i = 0; i < jobIds.length; i++) { + Job job = jobSession.loadJob(jobIds[i]); + ExecuteJobCommand.executeJob(job, jbpmContext); + } + return null; + } + +} Copied: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageService.java (from rev 2613, jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageServiceImpl.java) =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageService.java (rev 0) +++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageService.java 2008-10-25 01:14:15 UTC (rev 2617) @@ -0,0 +1,146 @@ +/* + * 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.msg.jms; + +import javax.jms.Connection; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageProducer; +import javax.jms.Session; + +import org.jbpm.JbpmContext; +import org.jbpm.JbpmException; +import org.jbpm.db.JobSession; +import org.jbpm.job.Job; +import org.jbpm.msg.MessageService; + +public class JmsMessageService implements MessageService { + + private static final long serialVersionUID = 1L; + + JobSession jobSession = null; + Connection connection = null; + Session session = null; + Destination destination = null; + MessageProducer messageProducer = null; + boolean isCommitEnabled = false; + + public JmsMessageService(Connection connection, Destination destination, boolean isCommitEnabled) throws JMSException { + JbpmContext jbpmContext = JbpmContext.getCurrentJbpmContext(); + if (jbpmContext==null) { + throw new JbpmException("jms message service must be created inside a jbpm context"); + } + this.jobSession = jbpmContext.getJobSession(); + + this.connection = connection; + this.destination = destination; + this.isCommitEnabled = isCommitEnabled; + /* + * If the connection supports XA, the session will always take part in the global transaction. + * Otherwise the first parameter specifies whether message productions and consumptions + * are part of a single transaction (TRUE) or performed immediately (FALSE). + * Messages are never meant to be received before the database transaction commits, + * hence the transacted is preferable. + */ + session = connection.createSession(true, Session.SESSION_TRANSACTED); + } + + public void send(Job job) { + try { + jobSession.saveJob(job); + + Message message = session.createMessage(); + message.setLongProperty("jobId", job.getId()); + if (job.getToken()!=null) { + message.setLongProperty("tokenId", job.getToken().getId()); + } + if (job.getProcessInstance()!=null) { + message.setLongProperty("processInstanceId", job.getProcessInstance().getId()); + } + if (job.getTaskInstance()!=null) { + message.setLongProperty("taskInstanceId", job.getTaskInstance().getId()); + } + getMessageProducer().send(message); + } catch (JMSException e) { + throw new JbpmException("couldn't send jms message", e); + } + } + + public void close() { + JbpmException exception = null; + + if (messageProducer!=null) { + try { + messageProducer.close(); + } catch (Exception e) { + // NOTE that Error's are not caught because that might halt the JVM and mask the original Error. + exception = new JbpmException("couldn't close message producer", e); + } + } + + if (session!=null) { + if (isCommitEnabled) { + try { + session.commit(); + } catch (Exception e) { + if (exception==null) { + exception = new JbpmException("couldn't commit JMS session", e); + } + } + } + + try { + session.close(); + } catch (Exception e) { + if (exception==null) { + exception = new JbpmException("couldn't close JMS session", e); + } + } + } + + if (connection!=null) { + try { + connection.close(); + } catch (Exception e) { + if (exception==null) { + exception = new JbpmException("couldn't close JMS connection", e); + } + } + } + + if (exception!=null) { + throw exception; + } + } + + public Session getSession() { + return session; + } + + protected MessageProducer getMessageProducer() throws JMSException { + if (messageProducer==null) { + messageProducer = session.createProducer(destination); + } + return messageProducer; + } +} Copied: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactory.java (from rev 2613, jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactoryImpl.java) =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactory.java (rev 0) +++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactory.java 2008-10-25 01:14:15 UTC (rev 2617) @@ -0,0 +1,128 @@ +/* + * 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.msg.jms; + +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import org.jbpm.JbpmException; +import org.jbpm.ejb.impl.JobListenerBean; +import org.jbpm.svc.Service; +import org.jbpm.svc.ServiceFactory; + +/** + * The JMS message service leverages the reliable communication infrastructure + * accessed through JMS interfaces to deliver asynchronous continuation + * messages to the {@link JobListenerBean}. + * + * <h3>Configuration</h3> + * + * The JMS message service factory exposes the following configurable fields. + * + * <ul> + * <li><code>connectionFactoryJndiName</code></li> + * <li><code>destinationJndiName</code></li> + * <li><code>isCommitEnabled</code></li> + * </ul> + * + * Refer to the jBPM manual for details. + * + * @author Tom Baeyens + * @author Alejandro Guizar + */ +public class JmsMessageServiceFactory implements ServiceFactory { + + private static final long serialVersionUID = 1L; + + String connectionFactoryJndiName = "java:comp/env/jms/JbpmConnectionFactory"; + String destinationJndiName = "java:comp/env/jms/JobQueue"; + String commandDestinationJndiName = "java:comp/env/jms/CommandQueue"; + boolean isCommitEnabled = false; + + private ConnectionFactory connectionFactory; + private Destination destination; + private Destination commandDestination; + + public ConnectionFactory getConnectionFactory() { + if (connectionFactory == null) { + try { + connectionFactory = (ConnectionFactory) lookup(connectionFactoryJndiName); + } + catch (NamingException e) { + throw new JbpmException("could not retrieve message connection factory", e); + } + } + return connectionFactory; + } + + public Destination getDestination() { + if (destination == null) { + try { + destination = (Destination) lookup(destinationJndiName); + } + catch (NamingException e) { + throw new JbpmException("could not retrieve message destination", e); + } + } + return destination; + } + + public Destination getCommandDestination() { + return commandDestination; + } + + public boolean isCommitEnabled() { + return isCommitEnabled; + } + + private static Object lookup(String name) throws NamingException { + Context initial = new InitialContext(); + try { + return initial.lookup(name); + } + finally { + initial.close(); + } + } + + public Service openService() { + try { + Connection connection = getConnectionFactory().createConnection(); + return new JmsMessageService(connection, getDestination(), isCommitEnabled); + } + catch (JMSException e) { + throw new JbpmException("couldn't open message session", e); + } + } + + public void close() { + connectionFactory = null; + destination = null; + commandDestination = null; + } + +} Modified: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactoryImpl.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactoryImpl.java 2008-10-25 01:08:36 UTC (rev 2616) +++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageServiceFactoryImpl.java 2008-10-25 01:14:15 UTC (rev 2617) @@ -22,104 +22,28 @@ package org.jbpm.msg.jms; import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; import javax.jms.JMSException; -import javax.jms.Session; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import org.jbpm.JbpmException; -import org.jbpm.ejb.impl.JobListenerBean; import org.jbpm.svc.Service; -import org.jbpm.svc.ServiceFactory; /** - * The JMS message service leverages the reliable communication infrastructure - * accessed through JMS interfaces to deliver asynchronous continuation - * messages to the {@link JobListenerBean}. - * - * <h3>Configuration</h3> - * - * The JMS message service factory exposes the following configurable fields. - * - * <ul> - * <li><code>connectionFactoryJndiName</code></li> - * <li><code>destinationJndiName</code></li> - * <li><code>isCommitEnabled</code></li> - * </ul> - * - * Refer to the jBPM manual for details. - * - * @author Tom Baeyens - * @author Alejandro Guizar + * Alias for {@link JmsMessageServiceFactory}, supplied for compatibility + * with the jBPM 3.2 series. + * @deprecated replaced by {@link JmsMessageServiceFactory} */ -public class JmsMessageServiceFactoryImpl implements ServiceFactory { +public class JmsMessageServiceFactoryImpl extends JmsMessageServiceFactory { private static final long serialVersionUID = 1L; - - String connectionFactoryJndiName = "java:comp/env/jms/JbpmConnectionFactory"; - String destinationJndiName = "java:comp/env/jms/JobQueue"; - boolean isCommitEnabled = false; - private ConnectionFactory connectionFactory; - private Destination destination; - - public ConnectionFactory getConnectionFactory() { - if (connectionFactory == null) { - try { - connectionFactory = (ConnectionFactory) lookup(connectionFactoryJndiName); - } - catch (NamingException e) { - throw new JbpmException("could not retrieve message connection factory", e); - } - } - return connectionFactory; - } - - public Destination getDestination() { - if (destination == null) { - try { - destination = (Destination) lookup(destinationJndiName); - } - catch (NamingException e) { - throw new JbpmException("could not retrieve message destination", e); - } - } - return destination; - } - - private static Object lookup(String name) throws NamingException { - Context initial = new InitialContext(); - try { - return initial.lookup(name); - } - finally { - initial.close(); - } - } - public Service openService() { try { Connection connection = getConnectionFactory().createConnection(); - - // If you use an XA connection factory in JBoss, the parameters will be ignored. It will always take part in the global JTA transaction. - // If you use a non XA connection factory, the first parameter specifies whether you want to have all message productions and - // consumptions as part of one transaction (TRUE) or whether you want all productions and consumptions to be instantanious (FALSE) - // Of course, we never want messages to be received before the current jbpm transaction commits so we just set it to true. - Session session = connection.createSession(true, Session.SESSION_TRANSACTED); - - return new JmsMessageServiceImpl(connection, session, getDestination(), isCommitEnabled); + return new JmsMessageServiceImpl(connection, getDestination(), isCommitEnabled); } catch (JMSException e) { throw new JbpmException("couldn't open message session", e); - } + } } - public void close() { - connectionFactory = null; - destination = null; - } - } Modified: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageServiceImpl.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageServiceImpl.java 2008-10-25 01:08:36 UTC (rev 2616) +++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/msg/jms/JmsMessageServiceImpl.java 2008-10-25 01:14:15 UTC (rev 2617) @@ -24,112 +24,18 @@ import javax.jms.Connection; import javax.jms.Destination; import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageProducer; -import javax.jms.Session; -import org.jbpm.JbpmContext; -import org.jbpm.JbpmException; -import org.jbpm.db.JobSession; -import org.jbpm.job.Job; -import org.jbpm.msg.MessageService; +/** + * Alias for {@link JmsMessageService}, supplied for compatibility with the + * jBPM 3.2 series. + * @deprecated replaced by {@link JmsMessageService} + */ +public class JmsMessageServiceImpl extends JmsMessageService { -public class JmsMessageServiceImpl implements MessageService { - private static final long serialVersionUID = 1L; - JobSession jobSession = null; - Connection connection = null; - Session session = null; - Destination destination = null; - MessageProducer messageProducer = null; - boolean isCommitEnabled = false; - - public JmsMessageServiceImpl(Connection connection, Session session, Destination destination, boolean isCommitEnabled) { - this.connection = connection; - this.session = session; - this.destination = destination; - this.isCommitEnabled = isCommitEnabled; - - JbpmContext jbpmContext = JbpmContext.getCurrentJbpmContext(); - if (jbpmContext==null) { - throw new JbpmException("instantiation of the JmsMessageService requires a current JbpmContext"); - } - this.jobSession = jbpmContext.getJobSession(); + public JmsMessageServiceImpl(Connection connection, Destination destination, boolean isCommitEnabled) throws JMSException { + super(connection, destination, isCommitEnabled); } - public void send(Job job) { - try { - jobSession.saveJob(job); - - Message message = session.createMessage(); - message.setLongProperty("jobId", job.getId()); - if (job.getToken()!=null) { - message.setLongProperty("tokenId", job.getToken().getId()); - } - if (job.getProcessInstance()!=null) { - message.setLongProperty("processInstanceId", job.getProcessInstance().getId()); - } - if (job.getTaskInstance()!=null) { - message.setLongProperty("taskInstanceId", job.getTaskInstance().getId()); - } - getMessageProducer().send(message); - } catch (JMSException e) { - throw new JbpmException("couldn't send jms message", e); - } - } - - public void close() { - JbpmException exception = null; - - if (messageProducer!=null) { - try { - messageProducer.close(); - } catch (Exception e) { - // NOTE that Error's are not caught because that might halt the JVM and mask the original Error. - exception = new JbpmException("couldn't close message producer", e); - } - } - - if (session!=null) { - if (isCommitEnabled) { - try { - session.commit(); - } catch (Exception e) { - if (exception==null) { - exception = new JbpmException("couldn't commit JMS session", e); - } - } - } - - try { - session.close(); - } catch (Exception e) { - if (exception==null) { - exception = new JbpmException("couldn't close JMS session", e); - } - } - } - - if (connection!=null) { - try { - connection.close(); - } catch (Exception e) { - if (exception==null) { - exception = new JbpmException("couldn't close JMS connection", e); - } - } - } - - if (exception!=null) { - throw exception; - } - } - - protected MessageProducer getMessageProducer() throws JMSException { - if (messageProducer==null) { - messageProducer = session.createProducer(destination); - } - return messageProducer; - } } Modified: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/scheduler/ejbtimer/EntitySchedulerService.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/scheduler/ejbtimer/EntitySchedulerService.java 2008-10-25 01:08:36 UTC (rev 2616) +++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/scheduler/ejbtimer/EntitySchedulerService.java 2008-10-25 01:14:15 UTC (rev 2617) @@ -29,8 +29,7 @@ public EntitySchedulerService(LocalTimerEntityHome timerEntityHome) { JbpmContext jbpmContext = JbpmContext.getCurrentJbpmContext(); if(jbpmContext == null) { - throw new JbpmException( - "instantiation of the EjbSchedulerService requires a current JbpmContext"); + throw new JbpmException("entity scheduler service must be created inside a jbpm context"); } this.jobSession = jbpmContext.getJobSession(); this.session = jbpmContext.getSession(); 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-10-25 01:08:36 UTC (rev 2616) +++ jbpm3/trunk/modules/enterprise/jar/src/main/resources/META-INF/ejb-jar.xml 2008-10-25 01:14:15 UTC (rev 2617) @@ -167,7 +167,7 @@ <message-destination-ref> <description> - Messages which do not contain a command are sent to the queue referenced here. Optional; + Messages that do not contain a command are sent to the queue referenced here. Optional; if absent, such messages are rejected, which may cause the container to redeliver. </description> <message-destination-ref-name>jms/DeadLetterQueue</message-destination-ref-name> @@ -211,7 +211,7 @@ <message-destination-ref> <description> - Messages which do not contain a job ID are sent to the queue referenced here. Optional; if + Messages that do not contain a job ID are sent to the queue referenced here. Optional; if absent, such messages are rejected, which may cause the container to redeliver. </description> <message-destination-ref-name>jms/DeadLetterQueue</message-destination-ref-name> Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/AppServerConfigurationsTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/AppServerConfigurationsTest.java 2008-10-25 01:08:36 UTC (rev 2616) +++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/enterprise/AppServerConfigurationsTest.java 2008-10-25 01:14:15 UTC (rev 2617) @@ -26,7 +26,7 @@ import org.apache.cactus.ServletTestCase; import org.jbpm.JbpmConfiguration; import org.jbpm.api.test.IntegrationTestSetup; -import org.jbpm.msg.jms.JmsMessageServiceFactoryImpl; +import org.jbpm.msg.jms.JmsMessageServiceFactory; import org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory; import org.jbpm.scheduler.ejbtimer.EntitySchedulerServiceFactory; import org.jbpm.svc.Services; @@ -55,7 +55,7 @@ public void testJmsMessageServiceFactoryConfiguration() { - assertSame(JmsMessageServiceFactoryImpl.class, jbpmConfiguration.getServiceFactory(Services.SERVICENAME_MESSAGE).getClass()); + assertSame(JmsMessageServiceFactory.class, jbpmConfiguration.getServiceFactory(Services.SERVICENAME_MESSAGE).getClass()); } public void testEjbSchedulerServiceFactoryConfiguration() Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/msg/jms/JmsMessageTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/msg/jms/JmsMessageTest.java 2008-10-25 01:08:36 UTC (rev 2616) +++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/msg/jms/JmsMessageTest.java 2008-10-25 01:14:15 UTC (rev 2617) @@ -44,7 +44,7 @@ import org.jbpm.graph.exe.ProcessInstance; /** - * Exercises for the {@linkplain JmsMessageServiceImpl JMS message service}. + * Exercises for the {@linkplain JmsMessageService JMS message service}. * @author Alejandro Guizar */ public class JmsMessageTest extends ServletTestCase { Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java 2008-10-25 01:08:36 UTC (rev 2616) +++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java 2008-10-25 01:14:15 UTC (rev 2617) @@ -60,9 +60,7 @@ private static final Log log = LogFactory.getLog(EjbSchedulerTest.class); public static Test suite() throws Exception { - return Boolean.getBoolean("datasource.xa") ? - new IntegrationTestSetup(EjbSchedulerTest.class, "enterprise-test.war") : - new TestSuite(); + return new IntegrationTestSetup(EjbSchedulerTest.class, "enterprise-test.war"); } protected void setUp() throws Exception { Modified: jbpm3/trunk/modules/userguide/src/main/docbook/en/modules/enterprise.xml =================================================================== --- jbpm3/trunk/modules/userguide/src/main/docbook/en/modules/enterprise.xml 2008-10-25 01:08:36 UTC (rev 2616) +++ jbpm3/trunk/modules/userguide/src/main/docbook/en/modules/enterprise.xml 2008-10-25 01:14:15 UTC (rev 2617) @@ -67,12 +67,21 @@ logical destination, <literal>JobQueue</literal>. </entry> </row> + <row> + <entry><literal>jms/CommandQueue</literal></entry> + <entry>Message Destination Reference</entry> + <entry>The command listener bean receives messages from the queue referenced here. + To ensure this is the same queue to which command messages can be sent, + the <literal>message-destination-link element</literal> points to a common + logical destination, <literal>CommandQueue</literal>. + </entry> + </row> </tbody> </tgroup> </table> <para><literal>CommandListenerBean</literal> is a message-driven bean that listens - on the <literal>JbpmCommandQueue</literal> for command messages. This bean delegates + on the <literal>CommandQueue</literal> for command messages. This bean delegates command execution to the <literal>CommandServiceBean</literal>. </para> @@ -203,7 +212,7 @@ <service name="persistence" factory="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory" /> <service name="message" - factory="org.jbpm.msg.jms.JmsMessageServiceFactoryImpl" /> + factory="org.jbpm.msg.jms.JmsMessageServiceFactory" /> <service name="scheduler" factory="org.jbpm.scheduler.ejbtimer.EntitySchedulerServiceFactory" /> </jbpm-context></programlisting> @@ -245,7 +254,7 @@ </itemizedlist> - <para><literal>JmsMessageServiceFactoryImpl</literal> leverages the reliable communication + <para><literal>JmsMessageServiceFactory</literal> leverages the reliable communication infrastructure exposed through JMS interfaces to deliver asynchronous continuation messages to the <literal>JobListenerBean</literal>. The JMS message service factory exposes the following configurable fields.</para> Modified: jbpm3/trunk/pom.xml =================================================================== --- jbpm3/trunk/pom.xml 2008-10-25 01:08:36 UTC (rev 2616) +++ jbpm3/trunk/pom.xml 2008-10-25 01:14:15 UTC (rev 2617) @@ -520,7 +520,7 @@ </property> </activation> <properties> - <datasource.xa>true</datasource.xa> + <datasource.xa /> </properties> <dependencies> <dependency> @@ -545,7 +545,7 @@ </property> </activation> <properties> - <datasource.xa>true</datasource.xa> + <datasource.xa /> </properties> <dependencies> <dependency>

17 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r2616 - jbpm3/trunk/modules/core/src/main/java/org/jbpm/db.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-10-24 21:08:36 -0400 (Fri, 24 Oct 2008) New Revision: 2616 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JbpmSchema.java Log: removed unused constant Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JbpmSchema.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JbpmSchema.java 2008-10-24 19:17:54 UTC (rev 2615) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/JbpmSchema.java 2008-10-25 01:08:36 UTC (rev 2616) @@ -63,8 +63,6 @@ private static final long serialVersionUID = 1L; - static final String JBPM_TABLE_PREFIX = "JBPM_"; - Configuration configuration = null; Properties properties = null; Dialect dialect = null;

17 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r2615 - projects/gwt-console/trunk.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-10-24 15:17:54 -0400 (Fri, 24 Oct 2008) New Revision: 2615 Modified: projects/gwt-console/trunk/pom.xml Log: Fix parent dependencies Modified: projects/gwt-console/trunk/pom.xml =================================================================== --- projects/gwt-console/trunk/pom.xml 2008-10-24 16:33:31 UTC (rev 2614) +++ projects/gwt-console/trunk/pom.xml 2008-10-24 19:17:54 UTC (rev 2615) @@ -1,126 +1,149 @@ <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 - GWT Console</name> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>gwt-console-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>pom</packaging> + <modelVersion>4.0.0</modelVersion> + <name>JBoss jBPM3 - GWT Console</name> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>gwt-console-parent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> -  - <parent> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm</artifactId> - <version>3.3.0-SNAPSHOT</version> - </parent> +  + <parent> + <groupId>org.jbpm</groupId> + <artifactId>jbpm-parent</artifactId> + <version>1.0.0.GA</version> + </parent> - <properties> - <gwt.version>1.5.2</gwt.version> - <gchart.version>2.2</gchart.version> - <gwtext.version>2.0.5</gwtext.version> - <stax-api.version>1.0-2</stax-api.version> - <jaf.version>1.1</jaf.version> - <resteasy.version>1.0-beta-8</resteasy.version> - <gson.version>1.2.2</gson.version> - <commons.fileupload.version>1.2.1</commons.fileupload.version> - <commons.io.version>1.3.2</commons.io.version> - <jbpm.version>3.3.0-SNAPSHOT</jbpm.version> - </properties> + <properties> + <gwt.version>1.5.2</gwt.version> + <gchart.version>2.2</gchart.version> + <gwtext.version>2.0.5</gwtext.version> + <stax-api.version>1.0-2</stax-api.version> + <jaf.version>1.1</jaf.version> + <resteasy.version>1.0-beta-8</resteasy.version> + <gson.version>1.2.2</gson.version> + <commons.fileupload.version>1.2.1</commons.fileupload.version> + <commons.io.version>1.3.2</commons.io.version> + <jbpm.version>3.3.0-SNAPSHOT</jbpm.version> + <javax.jaxb.version>2.1</javax.jaxb.version> + <javax.ejb.version>3.0</javax.ejb.version> + </properties> - <modules> - <module>rpc</module> - <module>server</module> - <module>war</module> - </modules> + <modules> + <module>rpc</module> + <module>server</module> + <module>war</module> + </modules> - <dependencyManagement> - <dependencies> + <dependencyManagement> + <dependencies> -  - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-core</artifactId> - <scope>provided</scope> - <version>${jbpm.version}</version> - </dependency> - <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-enterprise-beans</artifactId> - <scope>provided</scope> - <version>${jbpm.version}</version> - </dependency> +  + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-core</artifactId> + <scope>provided</scope> + <version>${jbpm.version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-enterprise-beans</artifactId> + <scope>provided</scope> + <version>${jbpm.version}</version> + </dependency> -  - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-servlet</artifactId> - <version>${gwt.version}</version> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> - <version>${gwt.version}</version> - </dependency> - - <dependency> - <groupId>com.gwtext</groupId> - <artifactId>gwtext</artifactId> - <version>${gwtext.version}</version> - </dependency> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gchart</artifactId> - <version>${gchart.version}</version> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gson.version}</version> - </dependency> +  + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>${gwt.version}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>${gwt.version}</version> + </dependency> -  - <dependency> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - <version>${stax-api.version}</version> - </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>${jaf.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jaxrs</artifactId> - <version>${resteasy.version}</version> - </dependency> + <dependency> + <groupId>com.gwtext</groupId> + <artifactId>gwtext</artifactId> + <version>${gwtext.version}</version> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gchart</artifactId> + <version>${gchart.version}</version> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gson.version}</version> + </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>${commons.fileupload.version}</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>${commons.io.version}</version> - </dependency> +  + <dependency> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + <version>${stax-api.version}</version> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>${jaf.version}</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${javax.jaxb.version}</version> + </dependency> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <version>${javax.ejb.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxrs</artifactId> + <version>${resteasy.version}</version> + </dependency> - </dependencies> - </dependencyManagement> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>${commons.fileupload.version}</version> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>${commons.io.version}</version> + </dependency> -  - <repositories> - <repository> - <id>repository.jboss.org</id> - <url>http://repository.jboss.org/maven2</url> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>gwt-maven</id> - <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> - </pluginRepository> - </pluginRepositories> + </dependencies> + </dependencyManagement> +  + <repositories> + <repository> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshot Repository</name> + <url>http://snapshots.jboss.org/maven2</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>gwt-maven</id> + <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo</url> + </pluginRepository> + </pluginRepositories> + </project>

17 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r2614 - jbpm3/trunk.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-10-24 12:33:31 -0400 (Fri, 24 Oct 2008) New Revision: 2614 Modified: jbpm3/trunk/profiles.xml.example Log: restore jboss.home properties Modified: jbpm3/trunk/profiles.xml.example =================================================================== --- jbpm3/trunk/profiles.xml.example 2008-10-24 15:52:52 UTC (rev 2613) +++ jbpm3/trunk/profiles.xml.example 2008-10-24 16:33:31 UTC (rev 2614) @@ -11,6 +11,10 @@ </property> </activation> <properties> + <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> + <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> + <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR2/build/output/jboss-5.0.0.CR2</jboss500.home> + <!-- <jdbc.mysql.url>jdbc:mysql://localhost:3306/jbpmtest</jdbc.mysql.url> <jdbc.mysql.username>jbpmtest</jdbc.mysql.username>

17 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r2613 - in jbpm3/trunk/modules/enterprise/jar/src: main/resources/META-INF and 1 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-10-24 11:52:52 -0400 (Fri, 24 Oct 2008) New Revision: 2613 Modified: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java jbpm3/trunk/modules/enterprise/jar/src/main/resources/META-INF/ejb-jar.xml jbpm3/trunk/modules/enterprise/jar/src/main/resources/META-INF/jboss.xml jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/msg/jms/JmsMessageTest.java Log: [JBPM-1709] support for exclusive jobs in jms message service, first cut Modified: jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java 2008-10-24 15:34:48 UTC (rev 2612) +++ jbpm3/trunk/modules/enterprise/jar/src/main/java/org/jbpm/ejb/impl/ExecuteJobCommand.java 2008-10-24 15:52:52 UTC (rev 2613) @@ -2,12 +2,14 @@ import java.io.PrintWriter; import java.io.StringWriter; +import java.util.Iterator; +import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.criterion.Restrictions; import org.jbpm.JbpmContext; import org.jbpm.command.Command; -import org.jbpm.db.JobSession; import org.jbpm.job.Job; public class ExecuteJobCommand implements Command { @@ -21,13 +23,37 @@ } public Object execute(JbpmContext jbpmContext) throws Exception { - JobSession jobSession = jbpmContext.getJobSession(); - Job job = jobSession.loadJob(jobId); - job.setLockOwner(getClass().getName()); // prevent others from removing job + Job job = (Job) jbpmContext.getSession().get(Job.class, jobId); + if (job == null || job.getLockOwner() != null) { + jbpmContext.setRollbackOnly(); + return null; + } + if (job.isExclusive()) { + // acquire exclusive jobs + List exclusiveJobs = jbpmContext.getSession().createCriteria(Job.class) + .add(Restrictions.isNull("lockMode")) + .add(Restrictions.eq("processInstance", job.getProcessInstance())) + .list(); + String lockOwner = Long.toString(jobId); + for (Iterator i = exclusiveJobs.iterator(); i.hasNext();) { + Job exclusiveJob = (Job) i.next(); + exclusiveJob.setLockOwner(lockOwner); + } + // execute exclusive jobs in separate transaction + + } + else { + executeJob(job, jbpmContext); + } + return job; + } + + private static void executeJob(Job job, JbpmContext jbpmContext) { + job.setLockOwner(ExecuteJobCommand.class.getName()); // prevent others from removing job log.debug("executing " + job); try { if (job.execute(jbpmContext)) { - jobSession.deleteJob(job); + jbpmContext.getJobSession().deleteJob(job); } } catch (RuntimeException e) { @@ -42,7 +68,6 @@ job.setException(memoryWriter.toString()); job.setRetries(job.getRetries() - 1); } - return job; } private static Log log = LogFactory.getLog(ExecuteJobCommand.class); 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-10-24 15:34:48 UTC (rev 2612) +++ jbpm3/trunk/modules/enterprise/jar/src/main/resources/META-INF/ejb-jar.xml 2008-10-24 15:52:52 UTC (rev 2613) @@ -91,6 +91,19 @@ <message-destination-usage>Produces</message-destination-usage> <message-destination-link>JobQueue</message-destination-link> </message-destination-ref> + + <message-destination-ref> + <description> + The command listener bean receives messages from the queue referenced here. To ensure this + is the same queue to which command messages can be sent, the message-destination-link + element points to a common logical destination, CommandQueue. + </description> + <message-destination-ref-name>jms/CommandQueue</message-destination-ref-name> + <message-destination-type>javax.jms.Queue</message-destination-type> + <message-destination-usage>Produces</message-destination-usage> + <message-destination-link>CommandQueue</message-destination-link> + </message-destination-ref> + </session> <!-- Timer service bean ==> @@ -129,6 +142,7 @@ <ejb-class>org.jbpm.ejb.impl.CommandListenerBean</ejb-class> <transaction-type>Container</transaction-type> <message-destination-type>javax.jms.Queue</message-destination-type> + <message-destination-link>CommandQueue</message-destination-link> <ejb-local-ref> <description> @@ -328,6 +342,10 @@ <message-destination-name>JobQueue</message-destination-name> </message-destination> + <message-destination> + <message-destination-name>CommandQueue</message-destination-name> + </message-destination> + </assembly-descriptor> </ejb-jar> Modified: jbpm3/trunk/modules/enterprise/jar/src/main/resources/META-INF/jboss.xml =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/main/resources/META-INF/jboss.xml 2008-10-24 15:34:48 UTC (rev 2612) +++ jbpm3/trunk/modules/enterprise/jar/src/main/resources/META-INF/jboss.xml 2008-10-24 15:52:52 UTC (rev 2613) @@ -23,7 +23,6 @@ <message-driven> <ejb-name>CommandListenerBean</ejb-name> - <destination-jndi-name>queue/JbpmCommandQueue</destination-jndi-name> <resource-ref> <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> <jndi-name>java:JmsXA</jndi-name> @@ -60,6 +59,10 @@ <message-destination-name>JobQueue</message-destination-name> <jndi-name>queue/JbpmJobQueue</jndi-name> </message-destination> + <message-destination> + <message-destination-name>CommandQueue</message-destination-name> + <jndi-name>queue/JbpmCommandQueue</jndi-name> + </message-destination> </assembly-descriptor> Modified: jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/msg/jms/JmsMessageTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/msg/jms/JmsMessageTest.java 2008-10-24 15:34:48 UTC (rev 2612) +++ jbpm3/trunk/modules/enterprise/jar/src/test/java/org/jbpm/msg/jms/JmsMessageTest.java 2008-10-24 15:52:52 UTC (rev 2613) @@ -183,7 +183,7 @@ + " <node name='e' async='true'>" + " <transition to='j' />" + " </node>" - + " <join name='j'>" + + " <join name='j' async='exclusive'>" + " <transition to='end' />" + " </join>" + " <end-state name='end' />"

17 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r2612 - jbpm3/trunk/modules/core.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-10-24 11:34:48 -0400 (Fri, 24 Oct 2008) New Revision: 2612 Modified: jbpm3/trunk/modules/core/pom.xml Log: [JBPM-1448] exclude ProcessArchiveDeploymentDbTest Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2008-10-24 15:25:58 UTC (rev 2611) +++ jbpm3/trunk/modules/core/pom.xml 2008-10-24 15:34:48 UTC (rev 2612) @@ -221,6 +221,8 @@ <exclude>org/jbpm/perf/StateUpdateTest.java</exclude>  <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude> +  + <exclude>org/jbpm/jpdl/par/ProcessArchiveDeploymentDbTest.java</exclude> </excludes> </configuration> </plugin> @@ -254,6 +256,8 @@ <exclude>org/jbpm/perf/StateUpdateTest.java</exclude>  <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude> +  + <exclude>org/jbpm/jpdl/par/ProcessArchiveDeploymentDbTest.java</exclude> </excludes> </configuration> </plugin> @@ -289,6 +293,8 @@ <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude>  <exclude>org/jbpm/graph/node/ProcessStateDbTest.java</exclude> +  + <exclude>org/jbpm/jpdl/par/ProcessArchiveDeploymentDbTest.java</exclude> </excludes> </configuration> </plugin> @@ -327,6 +333,8 @@ <exclude>org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java</exclude>  <exclude>org/jbpm/jpdl/exe/JoinExecutionDbTest.java</exclude> +  + <exclude>org/jbpm/jpdl/par/ProcessArchiveDeploymentDbTest.java</exclude> </excludes> </configuration> </plugin> @@ -362,6 +370,8 @@ <exclude>org/jbpm/seam/SeamPageFlowTest.java</exclude>  <exclude>org/jbpm/job/executor/JobExecutorDbTest</exclude> +  + <exclude>org/jbpm/jpdl/par/ProcessArchiveDeploymentDbTest.java</exclude> </excludes> </configuration> </plugin>

17 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r2611 - in jbpm3/trunk: hudson/hudson-home and 3 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-10-24 11:25:58 -0400 (Fri, 24 Oct 2008) New Revision: 2611 Modified: jbpm3/trunk/hudson/hudson-home/command.sh jbpm3/trunk/modules/core/pom.xml jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.mysql.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.postgresql.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml jbpm3/trunk/profiles.xml.example Log: [JBPM-1408] externalize jdbc properties Modified: jbpm3/trunk/hudson/hudson-home/command.sh =================================================================== --- jbpm3/trunk/hudson/hudson-home/command.sh 2008-10-24 15:23:02 UTC (rev 2610) +++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-10-24 15:25:58 UTC (rev 2611) @@ -83,7 +83,7 @@ # # execute tests # -MVN_CMD="mvn -o $ENVIRONMENT -DtestFailureIgnore=true test" +MVN_CMD="mvn -o -fae $ENVIRONMENT test" echo $MVN_CMD; $MVN_CMD 2>&1 | tee $WORKSPACE/tests.log cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2008-10-24 15:23:02 UTC (rev 2610) +++ jbpm3/trunk/modules/core/pom.xml 2008-10-24 15:25:58 UTC (rev 2611) @@ -120,6 +120,12 @@  <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> @@ -159,7 +165,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <phase>generate-resources</phase> + <phase>compile</phase> <goals> <goal>run</goal> </goals> Modified: jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml =================================================================== --- jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml 2008-10-24 15:23:02 UTC (rev 2610) +++ jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml 2008-10-24 15:25:58 UTC (rev 2611) @@ -14,7 +14,7 @@ <project default="concat"> <property name="project.build.directory" value="${basedir}/target"/> - <property name="project.resources.directory" value="${basedir}/src/main/resources"/> + <property name="project.resources.directory" value="${basedir}/target/classes"/>  <property name="hibernate.connection.driver_class">com.mysql.jdbc.Driver</property> - <property name="hibernate.connection.url">jdbc:mysql://localhost:3306/jbpmtest</property> - <property name="hibernate.connection.username">jbpmtest</property> - <property name="hibernate.connection.password"></property> + <property name="hibernate.connection.url">${jdbc.mysql.url}</property> + <property name="hibernate.connection.username">${jdbc.mysql.username}</property> + <property name="hibernate.connection.password">${jdbc.mysql.password}</property> <property name="hibernate.query.substitutions">true 1, false 0</property>  Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.postgresql.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.postgresql.xml 2008-10-24 15:23:02 UTC (rev 2610) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.postgresql.xml 2008-10-24 15:25:58 UTC (rev 2611) @@ -4,7 +4,7 @@  <property name="hibernate.connection.driver_class">org.postgresql.Driver</property> - <property name="hibernate.connection.url">jdbc:postgresql://localhost:5432/jbpmtest</property> - <property name="hibernate.connection.username">jbpmtest</property> - <property name="hibernate.connection.password"></property> + <property name="hibernate.connection.url">${jdbc.postgresql.url}</property> + <property name="hibernate.connection.username">${jdbc.postgresql.username}</property> + <property name="hibernate.connection.password">${jdbc.postgresql.password}</property>  Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml 2008-10-24 15:23:02 UTC (rev 2610) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml 2008-10-24 15:25:58 UTC (rev 2611) @@ -11,8 +11,8 @@  <property name="hibernate.connection.driver_class">net.sourceforge.jtds.jdbc.Driver</property> - <property name="hibernate.connection.url">jdbc:jtds:sybase://dev01.qa.atl.jboss.com:4100/jbpmteam</property> - <property name="hibernate.connection.username">jbpmteam</property> - <property name="hibernate.connection.password">jbpmteam</property> + <property name="hibernate.connection.url">${jdbc.sybase.url}</property> + <property name="hibernate.connection.username">${jdbc.sybase.username}</property> + <property name="hibernate.connection.password">${jdbc.sybase.password}</property>  Modified: jbpm3/trunk/profiles.xml.example =================================================================== --- jbpm3/trunk/profiles.xml.example 2008-10-24 15:23:02 UTC (rev 2610) +++ jbpm3/trunk/profiles.xml.example 2008-10-24 15:25:58 UTC (rev 2611) @@ -2,8 +2,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/profiles-1.0.0.xsd"> <profiles> -  -  <profile> <id>jboss-home-profile</id> @@ -13,9 +11,19 @@ </property> </activation> <properties> - <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> - <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> - <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR2/build/output/jboss-5.0.0.CR2</jboss500.home> +  </properties> </profile>

17 years, 6 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits October 2008