Author: alex.guizar(a)jboss.com Date: 2008-10-16 03:33:28 -0400 (Thu, 16 Oct 2008) New Revision: 2547 Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/main/jar/META-INF/ejb-jar.xml jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/main/jar/META-INF/jbosscmp-jdbc.xml Log: merged revisions 2080, 2114, 2134, 2155 and 2169 from https://svn.jboss.org/repos/jbpm/jbpm3/trunk/modules/enterprise/jar/src/m... Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/main/jar/META-INF/ejb-jar.xml =================================================================== --- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/main/jar/META-INF/ejb-jar.xml 2008-10-16 07:31:42 UTC (rev 2546) +++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/main/jar/META-INF/ejb-jar.xml 2008-10-16 07:33:28 UTC (rev 2547) @@ -21,7 +21,8 @@ <ejb-class>org.jbpm.ejb.impl.CommandServiceBean</ejb-class> <session-type>Stateless</session-type> <transaction-type>Container</transaction-type> - <!-- + + <!-- Configuration resource ==> <env-entry> <description> The classpath resource from which to read the jBPM configuration. Optional, defaults to @@ -31,18 +32,21 @@ <env-entry-type>java.lang.String</env-entry-type> <env-entry-value>jbpm.cfg.xml</env-entry-value> </env-entry> - --> + <!== Configuration resource --> + <ejb-local-ref> <description> Link to the local entity bean that implements the scheduler service. Required for processes that contain timers. </description> - <ejb-ref-name>ejb/LocalTimerEntityBean</ejb-ref-name> + <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> <ejb-ref-type>Entity</ejb-ref-type> <local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home> <local>org.jbpm.ejb.LocalTimerEntity</local> <ejb-link>TimerEntityBean</ejb-link> </ejb-local-ref> + + <!-- Timer service bean ==> <ejb-local-ref> <description> Link to the local session bean that implements the scheduler service. Deprecated, replaced @@ -54,6 +58,8 @@ <local>org.jbpm.scheduler.ejbtimer.LocalTimerService</local> <ejb-link>TimerServiceBean</ejb-link> </ejb-local-ref> + <!== Timer service bean --> + <resource-ref> <description> Logical name of the data source that provides connections to the persistence service. Must @@ -63,6 +69,7 @@ <res-type>javax.sql.DataSource</res-type> <res-auth>Container</res-auth> </resource-ref> + <resource-ref> <description> Logical name of the factory that provides JMS connections to the message service. Required @@ -72,6 +79,7 @@ <res-type>javax.jms.ConnnectionFactory</res-type> <res-auth>Container</res-auth> </resource-ref> + <message-destination-ref> <description> The message service sends job messages to the queue referenced here. To ensure this is the @@ -85,6 +93,7 @@ </message-destination-ref> </session> + <!-- Timer service bean ==> <session> <description> Interacts with the EJB timer service to schedule jBPM timers. Deprecated, replaced by the @@ -97,6 +106,7 @@ <ejb-class>org.jbpm.scheduler.ejbtimer.TimerServiceBean</ejb-class> <session-type>Stateless</session-type> <transaction-type>Container</transaction-type> + <ejb-local-ref> <description> Link to the session bean that executes timers on a separate context. @@ -108,6 +118,7 @@ <ejb-link>CommandServiceBean</ejb-link> </ejb-local-ref> </session> + <!== Timer service bean --> <message-driven> <description> @@ -118,6 +129,7 @@ <ejb-class>org.jbpm.ejb.impl.CommandListenerBean</ejb-class> <transaction-type>Container</transaction-type> <message-destination-type>javax.jms.Queue</message-destination-type> + <ejb-local-ref> <description> Link to the local session bean that executes commands on a separate context. @@ -128,6 +140,7 @@ <local>org.jbpm.ejb.LocalCommandService</local> <ejb-link>CommandServiceBean</ejb-link> </ejb-local-ref> + <resource-ref> <description> Logical name of the factory that provides JMS connections for producing result messages. @@ -137,6 +150,7 @@ <res-type>javax.jms.ConnectionFactory</res-type> <res-auth>Container</res-auth> </resource-ref> + <message-destination-ref> <description> Messages which do not contain a command are sent to the queue referenced here. Optional; @@ -159,6 +173,7 @@ <transaction-type>Container</transaction-type> <message-destination-type>javax.jms.Queue</message-destination-type> <message-destination-link>JobQueue</message-destination-link> + <ejb-local-ref> <description> Link to the local session bean that executes jobs on a separate context. @@ -169,6 +184,7 @@ <local>org.jbpm.ejb.LocalCommandService</local> <ejb-link>CommandServiceBean</ejb-link> </ejb-local-ref> + <resource-ref> <description> Logical name of the factory that provides JMS connections for producing result messages. @@ -178,6 +194,7 @@ <res-type>javax.jms.ConnectionFactory</res-type> <res-auth>Container</res-auth> </resource-ref> + <message-destination-ref> <description> Messages which do not contain a job ID are sent to the queue referenced here. Optional; if @@ -213,7 +230,11 @@ <cmp-field> <field-name>processInstanceId</field-name> </cmp-field> + <cmp-field> + <field-name>discriminator</field-name> + </cmp-field> <primkey-field>timerId</primkey-field> + <ejb-local-ref> <description> Link to the session bean that executes timers on a separate context. @@ -224,36 +245,24 @@ <local>org.jbpm.ejb.LocalCommandService</local> <ejb-link>CommandServiceBean</ejb-link> </ejb-local-ref> + <query> - <description>Retrieve all timers by token identifier</description> + <description>Retrieve all timers by name and token identifier</description> <query-method> - <method-name>findByTokenId</method-name> + <method-name>findByNameAndTokenId</method-name> <method-params> + <method-param>java.lang.String</method-param> <method-param>java.lang.Long</method-param> </method-params> </query-method> <ejb-ql><![CDATA[ select object(obj) from TimerEntityBean obj - where obj.tokenId = ?1 + where obj.name = ?1 and obj.tokenId = ?2 and obj.discriminator = 'T' ]]></ejb-ql> </query> + <query> - <description>Retrieve all timers by token identifier and name</description> - <query-method> - <method-name>findByTokenIdAndName</method-name> - <method-params> - <method-param>java.lang.Long</method-param> - <method-param>java.lang.String</method-param> - </method-params> - </query-method> - <ejb-ql><![CDATA[ - select object(obj) - from TimerEntityBean obj - where obj.tokenId = ?1 and obj.name = ?2 - ]]></ejb-ql> - </query> - <query> <description>Retrieve all timers by process instance identifier</description> <query-method> <method-name>findByProcessInstanceId</method-name> @@ -264,7 +273,7 @@ <ejb-ql><![CDATA[ select object(obj) from TimerEntityBean obj - where obj.processInstanceId = ?1 + where obj.processInstanceId = ?1 and obj.discriminator = 'T' ]]></ejb-ql> </query> </entity> @@ -281,6 +290,7 @@ <trans-attribute>Required</trans-attribute> </container-transaction> + <!-- Timer service bean ==> <container-transaction> <method> <ejb-name>TimerServiceBean</ejb-name> @@ -288,6 +298,7 @@ </method> <trans-attribute>Required</trans-attribute> </container-transaction> + <!== Timer service bean --> <container-transaction> <method> Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/main/jar/META-INF/jbosscmp-jdbc.xml =================================================================== --- jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/main/jar/META-INF/jbosscmp-jdbc.xml 2008-10-16 07:31:42 UTC (rev 2546) +++ jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/enterprise/src/main/jar/META-INF/jbosscmp-jdbc.xml 2008-10-16 07:33:28 UTC (rev 2547) @@ -31,6 +31,10 @@ <field-name>processInstanceId</field-name> <column-name>PROCESSINSTANCE_</column-name> </cmp-field> + <cmp-field> + <field-name>discriminator</field-name> + <column-name>CLASS_</column-name> + </cmp-field> </entity> </enterprise-beans> </jbosscmp-jdbc> \ No newline at end of file