[jbpm-commits] JBoss JBPM SVN: r6726 - in jbpm3/branches/jbpm-3.2-soa: distribution and 7 other directories.

Author: alex.guizar(a)jboss.com Date: 2010-10-01 23:18:25 -0400 (Fri, 01 Oct 2010) New Revision: 6726 Modified: jbpm3/branches/jbpm-3.2-soa/distribution/pom.xml jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-jbm-service.xml jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-mq-service.xml jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/etc/jbpm.cfg.xml jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/CommandServiceBean.java jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/JobListenerBean.java jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/jboss.xml jbpm3/branches/jbpm-3.2-soa/enterprise/pom.xml jbpm3/branches/jbpm-3.2-soa/pom.xml Log: JBPM-2945 provide an enterprise-jee5 configuration that works with jboss as 5.x and the jbpm3-jboss5xx hudson jobs; please mind the effects of any change on these jobs! Modified: jbpm3/branches/jbpm-3.2-soa/distribution/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/distribution/pom.xml 2010-10-02 00:41:56 UTC (rev 6725) +++ jbpm3/branches/jbpm-3.2-soa/distribution/pom.xml 2010-10-02 03:18:25 UTC (rev 6726) @@ -175,6 +175,10 @@ <artifactId>ant</artifactId> </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> <groupId>org.jboss.cluster</groupId> <artifactId>hibernate-jbc-cacheprovider</artifactId> </dependency> Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-jbm-service.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-jbm-service.xml 2010-10-02 00:41:56 UTC (rev 6725) +++ jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-jbm-service.xml 2010-10-02 03:18:25 UTC (rev 6726) @@ -1,30 +1,40 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!-- + This file defines the default queues that jBPM ships with. + The default queues are used by the Command Listener Bean + and the producer-consumer pair formed by the JMS Connector Service and + the Job/Timer Listener Bean. + + You can add other destinations to this file, or you can create other + *-service.xml files to contain your application's destinations. +--> + <server> + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.esb.destination:service=Queue,name=JbpmDLQ" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.esb.destination:service=Queue,name=JbpmDLQ" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - </mbean> - - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.esb.destination:service=Queue,name=JbpmCommandQueue" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="RedeliveryDelay">60000</attribute> - <attribute name="DLQ">jboss.esb.destination:service=Queue,name=JbpmDLQ</attribute> - </mbean> - - <mbean code="org.jboss.jms.server.destination.QueueService" - name="jboss.esb.destination:service=Queue,name=JbpmJobQueue" - xmbean-dd="xmdesc/Queue-xmbean.xml"> - <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> - <depends>jboss.messaging:service=PostOffice</depends> - <attribute name="RedeliveryDelay">60000</attribute> - <attribute name="DLQ">jboss.esb.destination:service=Queue,name=JbpmDLQ</attribute> - </mbean> - + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.esb.destination:service=Queue,name=JbpmJobQueue" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <!-- JBPM-1952 a small redelivery delay goes a long way towards mitigating + stale state exceptions and deadlocks under heavy concurrency conditions --> + <attribute name="RedeliveryDelay">5000</attribute> + <attribute name="DLQ">jboss.esb.destination:service=Queue,name=JbpmDLQ</attribute> + </mbean> + <mbean code="org.jboss.jms.server.destination.QueueService" + name="jboss.esb.destination:service=Queue,name=JbpmCommandQueue" + xmbean-dd="xmdesc/Queue-xmbean.xml"> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + <attribute name="RedeliveryDelay">5000</attribute> + <attribute name="DLQ">jboss.esb.destination:service=Queue,name=JbpmDLQ</attribute> + </mbean> </server> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-mq-service.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-mq-service.xml 2010-10-02 00:41:56 UTC (rev 6725) +++ jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/destination/jbpm-mq-service.xml 2010-10-02 03:18:25 UTC (rev 6726) @@ -11,7 +11,6 @@ --> <server> - <mbean code="org.jboss.mq.server.jmx.Queue" name="jboss.mq.destination:service=Queue,name=JbpmJobQueue"> <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> @@ -25,5 +24,4 @@ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends> <attribute name="RedeliveryDelay">1000</attribute> </mbean> - </server> Modified: jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml 2010-10-02 00:41:56 UTC (rev 6725) +++ jbpm3/branches/jbpm-3.2-soa/distribution/src/main/resources/installer/install-definition.xml 2010-10-02 03:18:25 UTC (rev 6726) @@ -236,6 +236,12 @@ <file condition="isJBoss423" src=&quot;(a){assemblyDirectory}/lib/hibernate-jbc-cacheprovider.jar&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" /> + <file condition="isJBoss501" + src=&quot;(a){assemblyDirectory}/lib/commons-lang.jar&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" /> + <file condition="isJBoss510" + src=&quot;(a){assemblyDirectory}/lib/commons-lang.jar&quot; + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" /> <!-- jbpm/jbpm-enterprise.jar --> <file src=&quot;(a){assemblyDirectory}/lib/jbpm-enterprise.jar&quot; Modified: jbpm3/branches/jbpm-3.2-soa/enterprise/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/enterprise/pom.xml 2010-10-02 00:41:56 UTC (rev 6725) +++ jbpm3/branches/jbpm-3.2-soa/enterprise/pom.xml 2010-10-02 03:18:25 UTC (rev 6726) @@ -10,7 +10,7 @@ <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>jBPM3 - Enterprise</name> + <name>jBPM3 - Enterprise Beans</name> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-enterprise</artifactId> <packaging>ejb</packaging> Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml 2010-10-02 00:41:56 UTC (rev 6725) +++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/pom.xml 2010-10-02 03:18:25 UTC (rev 6726) @@ -1,7 +1,7 @@ <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>jBPM3 - Enterprise JEE5</name> + <name>jBPM3 - JEE5 Enterprise Beans</name> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-enterprise-jee5</artifactId> <packaging>ejb</packaging> @@ -77,8 +77,6 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.4</version> - <type>jar</type> <scope>provided</scope> </dependency> </dependencies> Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/etc/jbpm.cfg.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/etc/jbpm.cfg.xml 2010-10-02 00:41:56 UTC (rev 6725) +++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/etc/jbpm.cfg.xml 2010-10-02 03:18:25 UTC (rev 6726) @@ -4,39 +4,26 @@ <service name="persistence" factory="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory" /> <service name="message"> <factory> - <bean class="org.jbpm.jms.JmsConnectorServiceFactory" singleton="true"> - <field name="jbpmConfiguration"> - <ref bean="jbpm.configuration" /> - </field> - </bean> + <ref bean="jbpm.jms.connector.service" /> </factory> </service> - <service name="message"> - <factory> - <ref bean="jbpm.jms.connector.command.service" /> - </factory> - </service> - <service name="scheduler"> - <factory> - <ref bean="jbpm.jms.connector.job.service" /> - </factory> - </service> + <service name="scheduler"> + <factory> + <ref bean="jbpm.jms.connector.service" /> + </factory> + </service> <service name="tx" factory="org.jbpm.tx.TxServiceFactory" /> <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" /> <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" /> </jbpm-context> - - <bean name="jbpm.jms.connector.command.service" class="org.jbpm.jms.JmsConnectorServiceFactory"> - <property name="connectionFactoryJndiName"><string value="java:JmsXA"/></property> - <property name="destinationJndiName"><string value="queue/JbpmJobQueue"/></property> + <bean name="jbpm.jms.connector.service" class="org.jbpm.jms.JmsConnectorServiceFactory" + singleton="true"> + <field name="jbpmConfiguration"> + <ref bean="jbpm.configuration" /> + </field> </bean> - - <bean name="jbpm.jms.connector.job.service" class="org.jbpm.jms.JmsConnectorServiceFactory"> - <property name="connectionFactoryJndiName"><string value="java:JmsXA"/></property> - <property name="destinationJndiName"><string value="queue/JbpmJobQueue"/></property> - </bean> - + <!-- employ the context class loader --> <string name="jbpm.class.loader" value="context" /> @@ -46,8 +33,8 @@ <!-- There should be no job executor in the enterprise configuration. - The message and scheduler services are both bound to JMS. - --> + The message and scheduler services are both bound to JMS. + --> <null name="jbpm.job.executor" /> </jbpm-configuration> Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/CommandServiceBean.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/CommandServiceBean.java 2010-10-02 00:41:56 UTC (rev 6725) +++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/CommandServiceBean.java 2010-10-02 03:18:25 UTC (rev 6726) @@ -83,13 +83,6 @@ * the same queue from which the {@linkplain JobListenerBean job listener bean} receives * messages.</td> * </tr> - * <tr> - * <td><code>jms/TimerQueue</code></td> - * <td>Message Destination Reference</td> - * <td>The scheduler service sends timer messages to the queue referenced here. Must be the - * same queue from which the {@linkplain TimerListenerBean timer listener bean} receives - * messages.</td> - * </tr> * </table> * * @author Alejandro Guizar @@ -99,7 +92,6 @@ @Resource(name = "jdbc/JbpmDataSource", type = DataSource.class, shareable = true), @Resource(name = "jms/JbpmConnectionFactory", type = ConnectionFactory.class, shareable = true), @Resource(name = "jms/JobQueue", type = Queue.class), - @Resource(name = "jms/TimerQueue", type = Queue.class) }) public class CommandServiceBean implements LocalCommandService { Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/JobListenerBean.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/JobListenerBean.java 2010-10-02 00:41:56 UTC (rev 6725) +++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/java/org/jbpm/ejb/JobListenerBean.java 2010-10-02 03:18:25 UTC (rev 6726) @@ -1,7 +1,10 @@ package org.jbpm.ejb; +import javax.ejb.ActivationConfigProperty; +import javax.ejb.MessageDriven; import javax.jms.JMSException; import javax.jms.Message; +import javax.jms.MessageListener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,6 +27,9 @@ * * @author Alejandro Guizar */ +@MessageDriven(messageListenerInterface = MessageListener.class, activationConfig = { + @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue") +}) public class JobListenerBean extends CommandListenerBean { private static final long serialVersionUID = 1L; Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml 2010-10-02 00:41:56 UTC (rev 6725) +++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/ejb-jar.xml 2010-10-02 03:18:25 UTC (rev 6726) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<ejb-jar version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<ejb-jar version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"> <enterprise-beans> @@ -35,16 +36,6 @@ <message-destination-usage>Produces</message-destination-usage> <mapped-name>queue/JbpmJobQueue</mapped-name> </message-destination-ref> - - <message-destination-ref> - <description> - The scheduler service sends timer messages to the queue referenced here. - Must be the same queue from which the TimerListenerBean receives messages. - </description> - <message-destination-ref-name>jms/TimerQueue</message-destination-ref-name> - <message-destination-usage>Produces</message-destination-usage> - <mapped-name>queue/JbpmTimerQueue</mapped-name> - </message-destination-ref> </session> <message-driven> @@ -54,21 +45,13 @@ <display-name>jBPM Command Listener</display-name> <ejb-name>CommandListenerBean</ejb-name> <mapped-name>queue/JbpmCommandQueue</mapped-name> - <ejb-class>org.jbpm.ejb.CommandListenerBean</ejb-class> + <ejb-class>org.jbpm.ejb.CommandListenerBean</ejb-class> <messaging-type>javax.jms.MessageListener</messaging-type> - <activation-config> - <activation-config-property> - <activation-config-property-name>destination</activation-config-property-name> - <activation-config-property-value>queue/JbpmCommandQueue</activation-config-property-value> - </activation-config-property> - <activation-config-property> - <activation-config-property-name>dLQJNDIName</activation-config-property-name> - <activation-config-property-value>queue/JbpmDLQ</activation-config-property-value> - </activation-config-property> - <activation-config-property> - <activation-config-property-name>maxSession</activation-config-property-name> - <activation-config-property-value>150</activation-config-property-value> - </activation-config-property> + <activation-config> + <activation-config-property> + <activation-config-property-name>maxSession</activation-config-property-name> + <activation-config-property-value>150</activation-config-property-value> + </activation-config-property> </activation-config> <resource-ref> <description> @@ -82,27 +65,16 @@ <message-driven> <description> - Listens for async job references and runs the jobs through the command service. + Listens for job references and runs the jobs through the command service. </description> - <display-name>jBPM Async Job Listener</display-name> - <ejb-name>AsyncJobListenerBean</ejb-name> + <display-name>jBPM Job Listener</display-name> + <ejb-name>JobListenerBean</ejb-name> <mapped-name>queue/JbpmJobQueue</mapped-name> - <ejb-class>org.jbpm.ejb.JobListenerBean</ejb-class> - <messaging-type>javax.jms.MessageListener</messaging-type> - <message-destination-type>javax.jms.Queue</message-destination-type> - <activation-config> - <activation-config-property> - <activation-config-property-name>destination</activation-config-property-name> - <activation-config-property-value>queue/JbpmJobQueue</activation-config-property-value> - </activation-config-property> - <activation-config-property> - <activation-config-property-name>dLQJNDIName</activation-config-property-name> - <activation-config-property-value>queue/JbpmDLQ</activation-config-property-value> - </activation-config-property> - <activation-config-property> - <activation-config-property-name>maxSession</activation-config-property-name> - <activation-config-property-value>150</activation-config-property-value> - </activation-config-property> + <activation-config> + <activation-config-property> + <activation-config-property-name>maxSession</activation-config-property-name> + <activation-config-property-value>150</activation-config-property-value> + </activation-config-property> </activation-config> <resource-ref> <description> @@ -113,6 +85,5 @@ <mapped-name>java:JmsXA</mapped-name> </resource-ref> </message-driven> - </enterprise-beans> </ejb-jar> Modified: jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/jboss.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/jboss.xml 2010-10-02 00:41:56 UTC (rev 6725) +++ jbpm3/branches/jbpm-3.2-soa/enterprise-jee5/src/main/resources/META-INF/jboss.xml 2010-10-02 03:18:25 UTC (rev 6726) @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> <jboss> - <enterprise-beans> - <message-driven> - <ejb-name>CommandListenerBean</ejb-name> - <depends>jboss.esb.destination:service=Queue,name=JbpmCommandQueue</depends> - <depends>jboss.esb.destination:service=Queue,name=JbpmDLQ</depends> - <aop-domain-name>AsyncRequestListenerBean MDB</aop-domain-name> - </message-driven> - <message-driven> - <ejb-name>JobListenerBean</ejb-name> - <depends>jboss.esb.destination:service=Queue,name=JbpmJobQueue</depends> - <depends>jboss.esb.destination:service=Queue,name=JbpmDLQ</depends> - <aop-domain-name>AsyncRequestListenerBean MDB</aop-domain-name> - </message-driven> - <session> - <ejb-name>CommandServiceBean</ejb-name> - <local-jndi-name>java:jbpm/CommandServiceBean</local-jndi-name> - </session> - </enterprise-beans> + <enterprise-beans> + <message-driven> + <ejb-name>CommandListenerBean</ejb-name> + <depends>jboss.esb.destination:service=Queue,name=JbpmCommandQueue</depends> + <depends>jboss.esb.destination:service=Queue,name=JbpmDLQ</depends> + </message-driven> + + <message-driven> + <ejb-name>JobListenerBean</ejb-name> + <depends>jboss.esb.destination:service=Queue,name=JbpmJobQueue</depends> + <depends>jboss.esb.destination:service=Queue,name=JbpmDLQ</depends> + </message-driven> + + <session> + <ejb-name>CommandServiceBean</ejb-name> + <local-jndi-name>java:jbpm/CommandServiceBean</local-jndi-name> + </session> + </enterprise-beans> </jboss> Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-10-02 00:41:56 UTC (rev 6725) +++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-10-02 03:18:25 UTC (rev 6726) @@ -132,6 +132,11 @@ <version>1.4</version> </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.5</version> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> <version>1.1.1</version>