[jboss-svn-commits] JBL Code SVN: r27454 - in labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product: services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 2 14:58:03 EDT 2009
Author: kevin.conner at jboss.com
Date: 2009-07-02 14:58:02 -0400 (Thu, 02 Jul 2009)
New Revision: 27454
Added:
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbm-queue-service.xml.config
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm-service.xml.config
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbm-queue-service.xml.config
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbmq-queue-service.xml.config
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm-service.xml.config
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_h2.sql
Removed:
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbm-queue-service.xml.config
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm-service.xml.config
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbm-queue-service.xml.config
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbmq-queue-service.xml.config
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm-service.xml.config
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config
Modified:
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/docs/AdministrationGuide.odt
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/RetryExecutor.java
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/timer/QuartzSchedulerService.java
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbm-queue-service.xml
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbmq-queue-service.xml
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm-quartz.properties
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm-service.xml
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm.cfg.xml
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_db2_v72.sql
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_db2_v8.sql
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_firebird.sql
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_hsqldb.sql
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_mysql.sql
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_mysql_innodb.sql
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_oracle.sql
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_pointbase.sql
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_postgres.sql
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_postgres7.sql
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_sqlServer.sql
labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_sybase.sql
Log:
Merge 4.4.0.GA_CP3_CR3 into SOA branch
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/docs/AdministrationGuide.odt
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/RetryExecutor.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/RetryExecutor.java 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/msg/RetryExecutor.java 2009-07-02 18:58:02 UTC (rev 27454)
@@ -107,29 +107,33 @@
if (jobSession != null)
{
final Set<Long> monitoredJobs = new HashSet<Long>() ;
+ final long now = System.currentTimeMillis() ;
for(int count = 0 ; count < maxRetryJobs ; count++)
{
final Job job = jobSession.getFirstDueJob(RETRY_EXECUTOR, monitoredJobs) ;
- if (job == null)
+ if ((job == null) || (job.getDueDate().getTime() > now))
{
break ;
}
monitoredJobs.add(Long.valueOf(job.getId())) ;
- job.setLockOwner(null) ;
- if (job instanceof Timer)
+ if (RETRY_EXECUTOR.equals(job.getLockOwner()))
{
- final Timer timer = (Timer)job ;
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Rescheduling timer " + timer.getId());
+ job.setLockOwner(null) ;
+ if (job instanceof Timer)
+ {
+ final Timer timer = (Timer)job ;
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Rescheduling timer " + timer.getId());
+ }
+ jbpmContext.getServices().getSchedulerService().createTimer(timer);
}
- jbpmContext.getServices().getSchedulerService().createTimer(timer);
- }
- else
- {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Rescheduling job " + job.getId());
+ else
+ {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Rescheduling job " + job.getId());
+ }
+ jbpmContext.getServices().getMessageService().send(job) ;
}
- jbpmContext.getServices().getMessageService().send(job) ;
}
}
}
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/timer/QuartzSchedulerService.java
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/timer/QuartzSchedulerService.java 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/java/org/jboss/soa/esb/services/jbpm/integration/timer/QuartzSchedulerService.java 2009-07-02 18:58:02 UTC (rev 27454)
@@ -69,6 +69,7 @@
*/
public void createTimer(final Timer timer)
{
+ jobSession.saveJob(timer) ;
final String name = getTimerName(timer) ;
final Trigger trigger = new SimpleTrigger(name, JBPM_GROUP, timer.getDueDate()) ;
final JobDetail jobDetail = new JobDetail(name, JBPM_GROUP, QuartzSchedulerServiceJob.class) ;
@@ -86,7 +87,6 @@
{
throw new JbpmException("Failed to schedule quartz job", se) ;
}
- jobSession.saveJob(timer) ;
}
/**
@@ -190,7 +190,7 @@
* The quartz job associated with executing a jBPM timer.
* @author kevin
*/
- private static final class QuartzSchedulerServiceJob implements org.quartz.Job
+ public static final class QuartzSchedulerServiceJob implements org.quartz.Job
{
/**
* The logger for this class.
Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config (from rev 27451, labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config)
Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler (from rev 27451, labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/jmsscheduler)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbm-queue-service.xml.config
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/jmsscheduler/jbm-queue-service.xml.config 2009-07-02 17:13:18 UTC (rev 27451)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbm-queue-service.xml.config 2009-07-02 18:58:02 UTC (rev 27454)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.destination:service=Queue,name=CallbackQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- </mbean>
- <!-- JMS message service -->
- <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>
- </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>
- </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>
- </mbean>
- <!-- End of JMS message service -->
- <!-- JMS scheduler service -->
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.destination:service=Queue,name=JbpmTimerQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- </mbean>
- <!-- End of JMS scheduler service -->
-</server>
Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbm-queue-service.xml.config (from rev 27451, labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/jmsscheduler/jbm-queue-service.xml.config)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbm-queue-service.xml.config (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbm-queue-service.xml.config 2009-07-02 18:58:02 UTC (rev 27454)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.destination:service=Queue,name=CallbackQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ </mbean>
+ <!-- JMS message service -->
+ <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>
+ </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>
+ </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>
+ </mbean>
+ <!-- End of JMS message service -->
+ <!-- JMS scheduler service -->
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.destination:service=Queue,name=JbpmTimerQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ </mbean>
+ <!-- End of JMS scheduler service -->
+</server>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm-service.xml.config
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm-service.xml.config 2009-07-02 17:13:18 UTC (rev 27451)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm-service.xml.config 2009-07-02 18:58:02 UTC (rev 27454)
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
- <classpath codebase="deploy" archives="jbpm.esb"/>
- <classpath codebase="deploy/jbossesb.sar/lib" archives="jbossesb-rosetta.jar"/>
-
- <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
- name="jboss.esb:service=JBPMDatabaseInitializer">
- <attribute name="Datasource">java:/JbpmDS</attribute>
- <attribute name="ExistsSql">select count(*) from JBPM_ID_USER</attribute>
- <attribute name="SqlFiles">
- jbpm-sql/jbpm.jpdl.hsqldb.sql,
- jbpm-sql/import.sql
- </attribute>
- <depends>jboss.jca:service=DataSourceBinding,name=JbpmDS</depends>
- <attribute name="UseEOL">true</attribute>
- </mbean>
-
- <mbean code="org.jboss.soa.esb.services.jbpm.configuration.JbpmService"
- name="jboss.esb:service=JbpmService">
- <depends>jboss.esb:service=JBPMDatabaseInitializer</depends>
- <!-- JMS message service -->
- <depends>jboss.esb.destination:service=Queue,name=JbpmJobQueue</depends>
- <depends>jboss.esb.destination:service=Queue,name=JbpmCommandQueue</depends>
- <depends>jboss.esb.destination:service=Queue,name=JbpmDLQ</depends>
- <!-- End of JMS message service -->
- <!-- JMS scheduler service -->
- <depends>jboss.esb.destination:service=Queue,name=JbpmTimerQueue</depends>
- <!-- End of JMS scheduler service -->
- </mbean>
-
- <!-- JMS message service -->
- <mbean code="org.jboss.internal.soa.esb.dependencies.JCAInflowAdapter"
- name="jboss.esb:service=JBPMJobExecutor">
- <attribute name="BeanType">org.jboss.soa.esb.services.jbpm.integration.command.JobListener</attribute>
- <attribute name="Adapter">jms-ra.rar</attribute>
- <attribute name="ActivationSpec">
- destination=queue/JbpmJobQueue
- destinationType=javax.xml.Queue
- </attribute>
- <!-- optional attributes -->
- <attribute name="MessagingInterface">javax.jms.MessageListener</attribute>
- <attribute name="IsTransacted">true</attribute>
- <attribute name="ActivationBridge">org.jboss.soa.esb.listeners.jca.JBoss42ActivationBridge</attribute>
- <attribute name="Description">jBPM Job Listener inflow</attribute>
- <depends>jboss.esb.destination:service=Queue,name=JbpmJobQueue</depends>
- </mbean>
-
- <mbean code="org.jboss.internal.soa.esb.dependencies.JCAInflowAdapter"
- name="jboss.esb:service=JBPMCommandExecutor">
- <attribute name="BeanType">org.jboss.soa.esb.services.jbpm.integration.command.CommandListener</attribute>
- <attribute name="Adapter">jms-ra.rar</attribute>
- <attribute name="ActivationSpec">
- destination=queue/JbpmCommandQueue
- destinationType=javax.xml.Queue
- </attribute>
- <!-- optional attributes -->
- <attribute name="MessagingInterface">javax.jms.MessageListener</attribute>
- <attribute name="IsTransacted">true</attribute>
- <attribute name="ActivationBridge">org.jboss.soa.esb.listeners.jca.JBoss42ActivationBridge</attribute>
- <attribute name="Description">jBPM Command Listener inflow</attribute>
- <depends>jboss.esb.destination:service=Queue,name=JbpmCommandQueue</depends>
- </mbean>
- <!-- End of JMS message service -->
- <!-- JMS scheduler service -->
- <mbean code="org.jboss.internal.soa.esb.dependencies.JCAInflowAdapter"
- name="jboss.esb:service=JBPMTimerExecutor">
- <attribute name="BeanType">org.jboss.soa.esb.services.jbpm.integration.command.JobListener</attribute>
- <attribute name="Adapter">jms-ra.rar</attribute>
- <attribute name="ActivationSpec">
- destination=queue/JbpmTimerQueue
- destinationType=javax.xml.Queue
- </attribute>
- <!-- optional attributes -->
- <attribute name="MessagingInterface">javax.jms.MessageListener</attribute>
- <attribute name="IsTransacted">true</attribute>
- <attribute name="ActivationBridge">org.jboss.soa.esb.listeners.jca.JBoss42ActivationBridge</attribute>
- <attribute name="Description">jBPM Timer Listener inflow</attribute>
- <depends>jboss.esb.destination:service=Queue,name=JbpmTimerQueue</depends>
- </mbean>
- <!-- End of JMS scheduler service -->
-</server>
Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm-service.xml.config (from rev 27451, labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm-service.xml.config)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm-service.xml.config (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm-service.xml.config 2009-07-02 18:58:02 UTC (rev 27454)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <classpath codebase="deploy" archives="jbpm.esb"/>
+ <classpath codebase="deploy/jbossesb.sar/lib" archives="jbossesb-rosetta.jar"/>
+
+ <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
+ name="jboss.esb:service=JBPMDatabaseInitializer">
+ <attribute name="Datasource">java:/JbpmDS</attribute>
+ <attribute name="ExistsSql">select count(*) from JBPM_ID_USER</attribute>
+ <attribute name="SqlFiles">
+ jbpm-sql/jbpm.jpdl.hsqldb.sql,
+ jbpm-sql/import.sql
+ </attribute>
+ <depends>jboss.jca:service=DataSourceBinding,name=JbpmDS</depends>
+ <attribute name="UseEOL">true</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.soa.esb.services.jbpm.configuration.JbpmService"
+ name="jboss.esb:service=JbpmService">
+ <depends>jboss.esb:service=JBPMDatabaseInitializer</depends>
+ <!-- JMS message service -->
+ <depends>jboss.esb.destination:service=Queue,name=JbpmJobQueue</depends>
+ <depends>jboss.esb.destination:service=Queue,name=JbpmCommandQueue</depends>
+ <depends>jboss.esb.destination:service=Queue,name=JbpmDLQ</depends>
+ <!-- End of JMS message service -->
+ <!-- JMS scheduler service -->
+ <depends>jboss.esb.destination:service=Queue,name=JbpmTimerQueue</depends>
+ <!-- End of JMS scheduler service -->
+ </mbean>
+
+ <!-- JMS message service -->
+ <mbean code="org.jboss.internal.soa.esb.dependencies.JCAInflowAdapter"
+ name="jboss.esb:service=JBPMJobExecutor">
+ <attribute name="BeanType">org.jboss.soa.esb.services.jbpm.integration.command.JobListener</attribute>
+ <attribute name="Adapter">jms-ra.rar</attribute>
+ <attribute name="ActivationSpec">
+ destination=queue/JbpmJobQueue
+ destinationType=javax.xml.Queue
+ </attribute>
+ <!-- optional attributes -->
+ <attribute name="MessagingInterface">javax.jms.MessageListener</attribute>
+ <attribute name="IsTransacted">true</attribute>
+ <attribute name="ActivationBridge">org.jboss.soa.esb.listeners.jca.JBoss42ActivationBridge</attribute>
+ <attribute name="Description">jBPM Job Listener inflow</attribute>
+ <depends>jboss.esb.destination:service=Queue,name=JbpmJobQueue</depends>
+ </mbean>
+
+ <mbean code="org.jboss.internal.soa.esb.dependencies.JCAInflowAdapter"
+ name="jboss.esb:service=JBPMCommandExecutor">
+ <attribute name="BeanType">org.jboss.soa.esb.services.jbpm.integration.command.CommandListener</attribute>
+ <attribute name="Adapter">jms-ra.rar</attribute>
+ <attribute name="ActivationSpec">
+ destination=queue/JbpmCommandQueue
+ destinationType=javax.xml.Queue
+ </attribute>
+ <!-- optional attributes -->
+ <attribute name="MessagingInterface">javax.jms.MessageListener</attribute>
+ <attribute name="IsTransacted">true</attribute>
+ <attribute name="ActivationBridge">org.jboss.soa.esb.listeners.jca.JBoss42ActivationBridge</attribute>
+ <attribute name="Description">jBPM Command Listener inflow</attribute>
+ <depends>jboss.esb.destination:service=Queue,name=JbpmCommandQueue</depends>
+ </mbean>
+ <!-- End of JMS message service -->
+ <!-- JMS scheduler service -->
+ <mbean code="org.jboss.internal.soa.esb.dependencies.JCAInflowAdapter"
+ name="jboss.esb:service=JBPMTimerExecutor">
+ <attribute name="BeanType">org.jboss.soa.esb.services.jbpm.integration.command.JobListener</attribute>
+ <attribute name="Adapter">jms-ra.rar</attribute>
+ <attribute name="ActivationSpec">
+ destination=queue/JbpmTimerQueue
+ destinationType=javax.xml.Queue
+ </attribute>
+ <!-- optional attributes -->
+ <attribute name="MessagingInterface">javax.jms.MessageListener</attribute>
+ <attribute name="IsTransacted">true</attribute>
+ <attribute name="ActivationBridge">org.jboss.soa.esb.listeners.jca.JBoss42ActivationBridge</attribute>
+ <attribute name="Description">jBPM Timer Listener inflow</attribute>
+ <depends>jboss.esb.destination:service=Queue,name=JbpmTimerQueue</depends>
+ </mbean>
+ <!-- End of JMS scheduler service -->
+</server>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config 2009-07-02 17:13:18 UTC (rev 27451)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config 2009-07-02 18:58:02 UTC (rev 27454)
@@ -1,57 +0,0 @@
-<jbpm-configuration>
-
- <!--
- This configuration is used when there is no jbpm.cfg.xml file found in the
- root of the classpath. It is a very basic configuration without persistence
- and message services. Only the authorization service installed.
- You can parse and create processes, but when you try to use one of the
- unavailable services, you'll get an exception.
- -->
-
- <jbpm-context>
- <service name="persistence">
- <factory>
- <bean class="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory">
- <field name="isTransactionEnabled"><false/></field>
- <field name="isCurrentSessionEnabled"><true/></field>
- <!--field name="sessionFactoryJndiName">
- <string value="java:/myHibSessFactJndiName" />
- </field-->
- </bean>
- </factory>
- </service>
- <service name="tx" factory="org.jbpm.tx.TxServiceFactory" />
- <!-- JMS message service -->
- <service name="message" factory="org.jboss.soa.esb.services.jbpm.integration.msg.JmsMessageServiceFactory" />
- <!-- End of JMS message service -->
- <!-- JMS scheduler -->
- <service name="scheduler" factory="org.jboss.soa.esb.services.jbpm.integration.timer.JmsSchedulerServiceFactory"/>
- <!-- End of JMS scheduler -->
- <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
- <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
- </jbpm-context>
-
- <!-- configuration property used by persistence service impl org.jbpm.persistence.db.DbPersistenceServiceFactory -->
- <string name="resource.hibernate.cfg.xml" value="hibernate.cfg.xml" />
-
- <!-- configuration resource files pointing to default configuration files in jbpm-{version}.jar -->
- <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties" />
- <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties" />
- <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties" />
- <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml" />
- <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml" />
- <string name="resource.parsers" value="org/jbpm/jpdl/par/jbpm.parsers.xml" />
- <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml" />
- <string name="resource.mail.templates" value="jbpm.mail.templates.xml" />
-
- <int name="jbpm.byte.block.size" value="1024" singleton="true" />
- <bean name="jbpm.task.instance.factory" class="org.jbpm.taskmgmt.impl.DefaultTaskInstanceFactoryImpl" singleton="true" />
- <bean name="jbpm.variable.resolver" class="org.jbpm.jpdl.el.impl.JbpmVariableResolver" singleton="true" />
- <string name="jbpm.mail.smtp.host" value="localhost" />
- <bean name="jbpm.mail.address.resolver" class="org.jbpm.identity.mail.IdentityAddressResolver" singleton="true" />
- <string name="jbpm.mail.from.address" value="jbpm at noreply" />
-
- <!-- JMS message service plus JMS/quartz scheduler service -->
- <null name="jbpm.job.executor"/>
- <!-- End of JMS message service plus JMS/quartz scheduler service -->
-</jbpm-configuration>
Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config (from rev 27451, labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/jmsscheduler/jbpm.cfg.xml.config 2009-07-02 18:58:02 UTC (rev 27454)
@@ -0,0 +1,57 @@
+<jbpm-configuration>
+
+ <!--
+ This configuration is used when there is no jbpm.cfg.xml file found in the
+ root of the classpath. It is a very basic configuration without persistence
+ and message services. Only the authorization service installed.
+ You can parse and create processes, but when you try to use one of the
+ unavailable services, you'll get an exception.
+ -->
+
+ <jbpm-context>
+ <service name="persistence">
+ <factory>
+ <bean class="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory">
+ <field name="isTransactionEnabled"><false/></field>
+ <field name="isCurrentSessionEnabled"><true/></field>
+ <!--field name="sessionFactoryJndiName">
+ <string value="java:/myHibSessFactJndiName" />
+ </field-->
+ </bean>
+ </factory>
+ </service>
+ <service name="tx" factory="org.jbpm.tx.TxServiceFactory" />
+ <!-- JMS message service -->
+ <service name="message" factory="org.jboss.soa.esb.services.jbpm.integration.msg.JmsMessageServiceFactory" />
+ <!-- End of JMS message service -->
+ <!-- JMS scheduler -->
+ <service name="scheduler" factory="org.jboss.soa.esb.services.jbpm.integration.timer.JmsSchedulerServiceFactory"/>
+ <!-- End of JMS scheduler -->
+ <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
+ <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
+ </jbpm-context>
+
+ <!-- configuration property used by persistence service impl org.jbpm.persistence.db.DbPersistenceServiceFactory -->
+ <string name="resource.hibernate.cfg.xml" value="hibernate.cfg.xml" />
+
+ <!-- configuration resource files pointing to default configuration files in jbpm-{version}.jar -->
+ <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties" />
+ <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties" />
+ <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties" />
+ <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml" />
+ <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml" />
+ <string name="resource.parsers" value="org/jbpm/jpdl/par/jbpm.parsers.xml" />
+ <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml" />
+ <string name="resource.mail.templates" value="jbpm.mail.templates.xml" />
+
+ <int name="jbpm.byte.block.size" value="1024" singleton="true" />
+ <bean name="jbpm.task.instance.factory" class="org.jbpm.taskmgmt.impl.DefaultTaskInstanceFactoryImpl" singleton="true" />
+ <bean name="jbpm.variable.resolver" class="org.jbpm.jpdl.el.impl.JbpmVariableResolver" singleton="true" />
+ <string name="jbpm.mail.smtp.host" value="localhost" />
+ <bean name="jbpm.mail.address.resolver" class="org.jbpm.identity.mail.IdentityAddressResolver" singleton="true" />
+ <string name="jbpm.mail.from.address" value="jbpm at noreply" />
+
+ <!-- JMS message service plus JMS/quartz scheduler service -->
+ <null name="jbpm.job.executor"/>
+ <!-- End of JMS message service plus JMS/quartz scheduler service -->
+</jbpm-configuration>
Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler (from rev 27451, labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/quartzscheduler)
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbm-queue-service.xml.config
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/quartzscheduler/jbm-queue-service.xml.config 2009-07-02 17:13:18 UTC (rev 27451)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbm-queue-service.xml.config 2009-07-02 18:58:02 UTC (rev 27454)
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.destination:service=Queue,name=CallbackQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- </mbean>
- <!-- JMS message service -->
- <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>
- </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>
- </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>
- </mbean>
- <!-- End of JMS message service -->
-</server>
Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbm-queue-service.xml.config (from rev 27451, labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/quartzscheduler/jbm-queue-service.xml.config)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbm-queue-service.xml.config (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbm-queue-service.xml.config 2009-07-02 18:58:02 UTC (rev 27454)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.destination:service=Queue,name=CallbackQueue"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ </mbean>
+ <!-- JMS message service -->
+ <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>
+ </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>
+ </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>
+ </mbean>
+ <!-- End of JMS message service -->
+</server>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbmq-queue-service.xml.config
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/quartzscheduler/jbmq-queue-service.xml.config 2009-07-02 17:13:18 UTC (rev 27451)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbmq-queue-service.xml.config 2009-07-02 18:58:02 UTC (rev 27454)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.destination:service=Queue,name=CallbackQueue">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
- </mbean>
- <!-- JMS message service -->
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.destination:service=Queue,name=JbpmJobQueue">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
- </mbean>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.destination:service=Queue,name=JbpmCommandQueue">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
- </mbean>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.destination:service=Queue,name=JbpmDLQ">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
- </mbean>
- <!-- End of JMS message service -->
-</server>
Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbmq-queue-service.xml.config (from rev 27451, labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/quartzscheduler/jbmq-queue-service.xml.config)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbmq-queue-service.xml.config (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbmq-queue-service.xml.config 2009-07-02 18:58:02 UTC (rev 27454)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.destination:service=Queue,name=CallbackQueue">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
+ <!-- JMS message service -->
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.destination:service=Queue,name=JbpmJobQueue">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.destination:service=Queue,name=JbpmCommandQueue">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.esb.destination:service=Queue,name=JbpmDLQ">
+ <depends optional-attribute-name="DestinationManager">
+ jboss.mq:service=DestinationManager
+ </depends>
+ </mbean>
+ <!-- End of JMS message service -->
+</server>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm-service.xml.config
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm-service.xml.config 2009-07-02 17:13:18 UTC (rev 27451)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm-service.xml.config 2009-07-02 18:58:02 UTC (rev 27454)
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
- <classpath codebase="deploy" archives="jbpm.esb"/>
- <classpath codebase="deploy/jbossesb.sar/lib" archives="jbossesb-rosetta.jar"/>
-
- <!-- quartz initialisation -->
- <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
- name="jboss.esb:service=JBPMQuartzInitializer">
- <attribute name="Datasource">java:/JbpmDS</attribute>
- <attribute name="ExistsSql">select count(*) from QRTZ_JOB_DETAILS</attribute>
- <attribute name="SqlFiles">
- quartz-sql/tables_h2.sql
- </attribute>
- <depends>jboss.jca:service=DataSourceBinding,name=JbpmDS</depends>
- </mbean>
- <!-- quartz initialisation -->
- <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
- name="jboss.esb:service=JBPMDatabaseInitializer">
- <attribute name="Datasource">java:/JbpmDS</attribute>
- <attribute name="ExistsSql">select count(*) from JBPM_ID_USER</attribute>
- <attribute name="SqlFiles">
- jbpm-sql/jbpm.jpdl.hsqldb.sql,
- jbpm-sql/import.sql
- </attribute>
- <depends>jboss.jca:service=DataSourceBinding,name=JbpmDS</depends>
- <attribute name="UseEOL">true</attribute>
- </mbean>
-
- <mbean code="org.jboss.soa.esb.services.jbpm.configuration.JbpmService"
- name="jboss.esb:service=JbpmService">
- <depends>jboss.esb:service=JBPMDatabaseInitializer</depends>
- <!-- quartz initialisation -->
- <depends>jboss.esb:service=JBPMQuartzInitializer</depends>
- <!-- quartz initialisation -->
- <!-- JMS message service -->
- <depends>jboss.esb.destination:service=Queue,name=JbpmJobQueue</depends>
- <depends>jboss.esb.destination:service=Queue,name=JbpmCommandQueue</depends>
- <depends>jboss.esb.destination:service=Queue,name=JbpmDLQ</depends>
- <!-- End of JMS message service -->
- </mbean>
-
- <!-- JMS message service -->
- <mbean code="org.jboss.internal.soa.esb.dependencies.JCAInflowAdapter"
- name="jboss.esb:service=JBPMJobExecutor">
- <attribute name="BeanType">org.jboss.soa.esb.services.jbpm.integration.command.JobListener</attribute>
- <attribute name="Adapter">jms-ra.rar</attribute>
- <attribute name="ActivationSpec">
- destination=queue/JbpmJobQueue
- destinationType=javax.xml.Queue
- </attribute>
- <!-- optional attributes -->
- <attribute name="MessagingInterface">javax.jms.MessageListener</attribute>
- <attribute name="IsTransacted">true</attribute>
- <attribute name="ActivationBridge">org.jboss.soa.esb.listeners.jca.JBoss42ActivationBridge</attribute>
- <attribute name="Description">jBPM Job Listener inflow</attribute>
- <depends>jboss.esb.destination:service=Queue,name=JbpmJobQueue</depends>
- </mbean>
-
- <mbean code="org.jboss.internal.soa.esb.dependencies.JCAInflowAdapter"
- name="jboss.esb:service=JBPMCommandExecutor">
- <attribute name="BeanType">org.jboss.soa.esb.services.jbpm.integration.command.CommandListener</attribute>
- <attribute name="Adapter">jms-ra.rar</attribute>
- <attribute name="ActivationSpec">
- destination=queue/JbpmCommandQueue
- destinationType=javax.xml.Queue
- </attribute>
- <!-- optional attributes -->
- <attribute name="MessagingInterface">javax.jms.MessageListener</attribute>
- <attribute name="IsTransacted">true</attribute>
- <attribute name="ActivationBridge">org.jboss.soa.esb.listeners.jca.JBoss42ActivationBridge</attribute>
- <attribute name="Description">jBPM Command Listener inflow</attribute>
- <depends>jboss.esb.destination:service=Queue,name=JbpmCommandQueue</depends>
- </mbean>
- <!-- End of JMS message service -->
-</server>
Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm-service.xml.config (from rev 27451, labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm-service.xml.config)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm-service.xml.config (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm-service.xml.config 2009-07-02 18:58:02 UTC (rev 27454)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<server>
+ <classpath codebase="deploy" archives="jbpm.esb"/>
+ <classpath codebase="deploy/jbossesb.sar/lib" archives="jbossesb-rosetta.jar"/>
+
+ <!-- quartz initialisation -->
+ <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
+ name="jboss.esb:service=JBPMQuartzInitializer">
+ <attribute name="Datasource">java:/JbpmDS</attribute>
+ <attribute name="ExistsSql">select count(*) from QRTZ_JOB_DETAILS</attribute>
+ <attribute name="SqlFiles">
+ quartz-sql/tables_h2.sql
+ </attribute>
+ <depends>jboss.jca:service=DataSourceBinding,name=JbpmDS</depends>
+ </mbean>
+ <!-- quartz initialisation -->
+ <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
+ name="jboss.esb:service=JBPMDatabaseInitializer">
+ <attribute name="Datasource">java:/JbpmDS</attribute>
+ <attribute name="ExistsSql">select count(*) from JBPM_ID_USER</attribute>
+ <attribute name="SqlFiles">
+ jbpm-sql/jbpm.jpdl.hsqldb.sql,
+ jbpm-sql/import.sql
+ </attribute>
+ <depends>jboss.jca:service=DataSourceBinding,name=JbpmDS</depends>
+ <attribute name="UseEOL">true</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.soa.esb.services.jbpm.configuration.JbpmService"
+ name="jboss.esb:service=JbpmService">
+ <depends>jboss.esb:service=JBPMDatabaseInitializer</depends>
+ <!-- quartz initialisation -->
+ <depends>jboss.esb:service=JBPMQuartzInitializer</depends>
+ <!-- quartz initialisation -->
+ <!-- JMS message service -->
+ <depends>jboss.esb.destination:service=Queue,name=JbpmJobQueue</depends>
+ <depends>jboss.esb.destination:service=Queue,name=JbpmCommandQueue</depends>
+ <depends>jboss.esb.destination:service=Queue,name=JbpmDLQ</depends>
+ <!-- End of JMS message service -->
+ </mbean>
+
+ <!-- JMS message service -->
+ <mbean code="org.jboss.internal.soa.esb.dependencies.JCAInflowAdapter"
+ name="jboss.esb:service=JBPMJobExecutor">
+ <attribute name="BeanType">org.jboss.soa.esb.services.jbpm.integration.command.JobListener</attribute>
+ <attribute name="Adapter">jms-ra.rar</attribute>
+ <attribute name="ActivationSpec">
+ destination=queue/JbpmJobQueue
+ destinationType=javax.xml.Queue
+ </attribute>
+ <!-- optional attributes -->
+ <attribute name="MessagingInterface">javax.jms.MessageListener</attribute>
+ <attribute name="IsTransacted">true</attribute>
+ <attribute name="ActivationBridge">org.jboss.soa.esb.listeners.jca.JBoss42ActivationBridge</attribute>
+ <attribute name="Description">jBPM Job Listener inflow</attribute>
+ <depends>jboss.esb.destination:service=Queue,name=JbpmJobQueue</depends>
+ </mbean>
+
+ <mbean code="org.jboss.internal.soa.esb.dependencies.JCAInflowAdapter"
+ name="jboss.esb:service=JBPMCommandExecutor">
+ <attribute name="BeanType">org.jboss.soa.esb.services.jbpm.integration.command.CommandListener</attribute>
+ <attribute name="Adapter">jms-ra.rar</attribute>
+ <attribute name="ActivationSpec">
+ destination=queue/JbpmCommandQueue
+ destinationType=javax.xml.Queue
+ </attribute>
+ <!-- optional attributes -->
+ <attribute name="MessagingInterface">javax.jms.MessageListener</attribute>
+ <attribute name="IsTransacted">true</attribute>
+ <attribute name="ActivationBridge">org.jboss.soa.esb.listeners.jca.JBoss42ActivationBridge</attribute>
+ <attribute name="Description">jBPM Command Listener inflow</attribute>
+ <depends>jboss.esb.destination:service=Queue,name=JbpmCommandQueue</depends>
+ </mbean>
+ <!-- End of JMS message service -->
+</server>
Deleted: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config
===================================================================
--- labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config 2009-07-02 17:13:18 UTC (rev 27451)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config 2009-07-02 18:58:02 UTC (rev 27454)
@@ -1,57 +0,0 @@
-<jbpm-configuration>
-
- <!--
- This configuration is used when there is no jbpm.cfg.xml file found in the
- root of the classpath. It is a very basic configuration without persistence
- and message services. Only the authorization service installed.
- You can parse and create processes, but when you try to use one of the
- unavailable services, you'll get an exception.
- -->
-
- <jbpm-context>
- <service name="persistence">
- <factory>
- <bean class="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory">
- <field name="isTransactionEnabled"><false/></field>
- <field name="isCurrentSessionEnabled"><true/></field>
- <!--field name="sessionFactoryJndiName">
- <string value="java:/myHibSessFactJndiName" />
- </field-->
- </bean>
- </factory>
- </service>
- <service name="tx" factory="org.jbpm.tx.TxServiceFactory" />
- <!-- JMS message service -->
- <service name="message" factory="org.jboss.soa.esb.services.jbpm.integration.msg.JmsMessageServiceFactory" />
- <!-- End of JMS message service -->
- <!-- quartz scheduler -->
- <service name="scheduler" factory="org.jboss.soa.esb.services.jbpm.integration.timer.QuartzSchedulerServiceFactory"/>
- <!-- End of Quartz scheduler -->
- <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
- <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
- </jbpm-context>
-
- <!-- configuration property used by persistence service impl org.jbpm.persistence.db.DbPersistenceServiceFactory -->
- <string name="resource.hibernate.cfg.xml" value="hibernate.cfg.xml" />
-
- <!-- configuration resource files pointing to default configuration files in jbpm-{version}.jar -->
- <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties" />
- <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties" />
- <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties" />
- <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml" />
- <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml" />
- <string name="resource.parsers" value="org/jbpm/jpdl/par/jbpm.parsers.xml" />
- <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml" />
- <string name="resource.mail.templates" value="jbpm.mail.templates.xml" />
-
- <int name="jbpm.byte.block.size" value="1024" singleton="true" />
- <bean name="jbpm.task.instance.factory" class="org.jbpm.taskmgmt.impl.DefaultTaskInstanceFactoryImpl" singleton="true" />
- <bean name="jbpm.variable.resolver" class="org.jbpm.jpdl.el.impl.JbpmVariableResolver" singleton="true" />
- <string name="jbpm.mail.smtp.host" value="localhost" />
- <bean name="jbpm.mail.address.resolver" class="org.jbpm.identity.mail.IdentityAddressResolver" singleton="true" />
- <string name="jbpm.mail.from.address" value="jbpm at noreply" />
-
- <!-- JMS message service plus JMS/quartz scheduler service -->
- <null name="jbpm.job.executor"/>
- <!-- End of JMS message service plus JMS/quartz scheduler service -->
-</jbpm-configuration>
Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config (from rev 27451, labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/config/quartzscheduler/jbpm.cfg.xml.config 2009-07-02 18:58:02 UTC (rev 27454)
@@ -0,0 +1,57 @@
+<jbpm-configuration>
+
+ <!--
+ This configuration is used when there is no jbpm.cfg.xml file found in the
+ root of the classpath. It is a very basic configuration without persistence
+ and message services. Only the authorization service installed.
+ You can parse and create processes, but when you try to use one of the
+ unavailable services, you'll get an exception.
+ -->
+
+ <jbpm-context>
+ <service name="persistence">
+ <factory>
+ <bean class="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory">
+ <field name="isTransactionEnabled"><false/></field>
+ <field name="isCurrentSessionEnabled"><true/></field>
+ <!--field name="sessionFactoryJndiName">
+ <string value="java:/myHibSessFactJndiName" />
+ </field-->
+ </bean>
+ </factory>
+ </service>
+ <service name="tx" factory="org.jbpm.tx.TxServiceFactory" />
+ <!-- JMS message service -->
+ <service name="message" factory="org.jboss.soa.esb.services.jbpm.integration.msg.JmsMessageServiceFactory" />
+ <!-- End of JMS message service -->
+ <!-- quartz scheduler -->
+ <service name="scheduler" factory="org.jboss.soa.esb.services.jbpm.integration.timer.QuartzSchedulerServiceFactory"/>
+ <!-- End of Quartz scheduler -->
+ <service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
+ <service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
+ </jbpm-context>
+
+ <!-- configuration property used by persistence service impl org.jbpm.persistence.db.DbPersistenceServiceFactory -->
+ <string name="resource.hibernate.cfg.xml" value="hibernate.cfg.xml" />
+
+ <!-- configuration resource files pointing to default configuration files in jbpm-{version}.jar -->
+ <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties" />
+ <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties" />
+ <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties" />
+ <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml" />
+ <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml" />
+ <string name="resource.parsers" value="org/jbpm/jpdl/par/jbpm.parsers.xml" />
+ <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml" />
+ <string name="resource.mail.templates" value="jbpm.mail.templates.xml" />
+
+ <int name="jbpm.byte.block.size" value="1024" singleton="true" />
+ <bean name="jbpm.task.instance.factory" class="org.jbpm.taskmgmt.impl.DefaultTaskInstanceFactoryImpl" singleton="true" />
+ <bean name="jbpm.variable.resolver" class="org.jbpm.jpdl.el.impl.JbpmVariableResolver" singleton="true" />
+ <string name="jbpm.mail.smtp.host" value="localhost" />
+ <bean name="jbpm.mail.address.resolver" class="org.jbpm.identity.mail.IdentityAddressResolver" singleton="true" />
+ <string name="jbpm.mail.from.address" value="jbpm at noreply" />
+
+ <!-- JMS message service plus JMS/quartz scheduler service -->
+ <null name="jbpm.job.executor"/>
+ <!-- End of JMS message service plus JMS/quartz scheduler service -->
+</jbpm-configuration>
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbm-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbm-queue-service.xml 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbm-queue-service.xml 2009-07-02 18:58:02 UTC (rev 27454)
@@ -5,21 +5,4 @@
xmbean-dd="xmdesc/Queue-xmbean.xml">
<depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
</mbean>
- <!-- JMS message service ==>
- <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>
- </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>
- </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>
- </mbean>
- <!== End of JMS message service -->
</server>
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbmq-queue-service.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbmq-queue-service.xml 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbmq-queue-service.xml 2009-07-02 18:58:02 UTC (rev 27454)
@@ -6,24 +6,4 @@
jboss.mq:service=DestinationManager
</depends>
</mbean>
- <!-- JMS message service ==>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.destination:service=Queue,name=JbpmJobQueue">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
- </mbean>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.destination:service=Queue,name=JbpmCommandQueue">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
- </mbean>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.esb.destination:service=Queue,name=JbpmDLQ">
- <depends optional-attribute-name="DestinationManager">
- jboss.mq:service=DestinationManager
- </depends>
- </mbean>
- <!== End of JMS message service -->
</server>
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm-quartz.properties
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm-quartz.properties 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm-quartz.properties 2009-07-02 18:58:02 UTC (rev 27454)
@@ -11,7 +11,9 @@
org.quartz.jobStore.class = org.quartz.impl.jdbcjobstore.JobStoreCMT
org.quartz.jobStore.dataSource=jbpmDS
org.quartz.jobStore.nonManagedTXDataSource=jbpmDS
+org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.HSQLDBDelegate
+
#org.quartz.jobStore.isClustered = true
#org.quartz.jobStore.clusterCheckinInterval = 20000
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm-service.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm-service.xml 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm-service.xml 2009-07-02 18:58:02 UTC (rev 27454)
@@ -4,18 +4,7 @@
<classpath codebase="deploy" archives="jbpm.esb"/>
<classpath codebase="deploy/jbossesb.sar/lib" archives="jbossesb-rosetta.jar"/>
- <!-- quartz initialisation ===
<mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
- name="jboss.esb:service=JBPMQuartzInitializer">
- <attribute name="Datasource">java:/JbpmDS</attribute>
- <attribute name="ExistsSql">select count(*) from QRTZ_JOB_DETAILS</attribute>
- <attribute name="SqlFiles">
- quartz-sql/tables_hsqldb.sql
- </attribute>
- <depends>jboss.jca:service=DataSourceBinding,name=JbpmDS</depends>
- </mbean>
- ==== quartz initialisation -->
- <mbean code="org.jboss.internal.soa.esb.dependencies.DatabaseInitializer"
name="jboss.esb:service=JBPMDatabaseInitializer">
<attribute name="Datasource">java:/JbpmDS</attribute>
<attribute name="ExistsSql">select count(*) from JBPM_ID_USER</attribute>
@@ -23,53 +12,11 @@
jbpm-sql/jbpm.jpdl.hsqldb.sql
</attribute>
<depends>jboss.jca:service=DataSourceBinding,name=JbpmDS</depends>
- <!-- quartz initialisation ===
- <depends>jboss.esb:service=JBPMQuartzInitializer</depends>
- ==== quartz initialisation -->
<attribute name="UseEOL">true</attribute>
</mbean>
<mbean code="org.jboss.soa.esb.services.jbpm.configuration.JbpmService"
name="jboss.esb:service=JbpmService">
<depends>jboss.esb:service=JBPMDatabaseInitializer</depends>
- <!-- JMS message service ==>
- <depends>jboss.esb.destination:service=Queue,name=JbpmJobQueue</depends>
- <depends>jboss.esb.destination:service=Queue,name=JbpmCommandQueue</depends>
- <depends>jboss.esb.destination:service=Queue,name=JbpmDLQ</depends>
- <!== End of JMS message service -->
</mbean>
-
- <!-- JMS message service ==>
- <mbean code="org.jboss.internal.soa.esb.dependencies.JCAInflowAdapter"
- name="jboss.esb:service=JBPMJobExecutor">
- <attribute name="BeanType">org.jboss.soa.esb.services.jbpm.integration.command.JobListener</attribute>
- <attribute name="Adapter">jms-ra.rar</attribute>
- <attribute name="ActivationSpec">
- destination=queue/JbpmJobQueue
- destinationType=javax.xml.Queue
- </attribute>
- <!== optional attributes ==>
- <attribute name="MessagingInterface">javax.jms.MessageListener</attribute>
- <attribute name="IsTransacted">true</attribute>
- <attribute name="ActivationBridge">org.jboss.soa.esb.listeners.jca.JBoss42ActivationBridge</attribute>
- <attribute name="Description">jBPM Job Listener inflow</attribute>
- <depends>jboss.esb.destination:service=Queue,name=JbpmJobQueue</depends>
- </mbean>
-
- <mbean code="org.jboss.internal.soa.esb.dependencies.JCAInflowAdapter"
- name="jboss.esb:service=JBPMCommandExecutor">
- <attribute name="BeanType">org.jboss.soa.esb.services.jbpm.integration.command.CommandListener</attribute>
- <attribute name="Adapter">jms-ra.rar</attribute>
- <attribute name="ActivationSpec">
- destination=queue/JbpmCommandQueue
- destinationType=javax.xml.Queue
- </attribute>
- <!== optional attributes ==>
- <attribute name="MessagingInterface">javax.jms.MessageListener</attribute>
- <attribute name="IsTransacted">true</attribute>
- <attribute name="ActivationBridge">org.jboss.soa.esb.listeners.jca.JBoss42ActivationBridge</attribute>
- <attribute name="Description">jBPM Command Listener inflow</attribute>
- <depends>jboss.esb.destination:service=Queue,name=JbpmCommandQueue</depends>
- </mbean>
- <!== End of JMS message service -->
</server>
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm.cfg.xml
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm.cfg.xml 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/jbpm.cfg.xml 2009-07-02 18:58:02 UTC (rev 27454)
@@ -23,15 +23,6 @@
<service name="tx" factory="org.jbpm.tx.TxServiceFactory" />
<service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" />
<service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" />
- <!-- JMS message service ==>
- <service name="message" factory="org.jboss.soa.esb.services.jbpm.integration.msg.JmsMessageServiceFactory" />
- <!== End of JMS message service -->
- <!-- JMS scheduler ==>
- <service name="scheduler" factory="org.jboss.soa.esb.services.jbpm.integration.timer.JmsSchedulerServiceFactory"/>
- <!== End of JMS scheduler -->
- <!-- quartz scheduler ===
- <service name="scheduler" factory="org.jboss.soa.esb.services.jbpm.integration.timer.QuartzSchedulerServiceFactory"/>
- <!== End of Quartz scheduler -->
<service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
<service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
</jbpm-context>
@@ -56,7 +47,6 @@
<bean name="jbpm.mail.address.resolver" class="org.jbpm.identity.mail.IdentityAddressResolver" singleton="true" />
<string name="jbpm.mail.from.address" value="jbpm at noreply" />
- <!-- DB message/scheduler service -->
<bean name="jbpm.job.executor" class="org.jbpm.job.executor.JobExecutor">
<field name="jbpmConfiguration"><ref bean="jbpmConfiguration" /></field>
<field name="name"><string value="JbpmJobExector" /></field>
@@ -68,9 +58,4 @@
<field name="lockMonitorInterval"><int value="60000" /></field> <!-- 1 minute -->
<field name="lockBufferTime"><int value="5000" /></field> <!-- 5 seconds -->
</bean>
- <!-- End of DB message/scheduler service -->
-
- <!-- JMS message service plus JMS/quartz scheduler service ==>
- <null name="jbpm.job.executor"/>
- <!== End of JMS message service plus JMS/quartz scheduler service -->
</jbpm-configuration>
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_db2_v72.sql
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_db2_v72.sql 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_db2_v72.sql 2009-07-02 18:58:02 UTC (rev 27454)
@@ -18,19 +18,6 @@
-- that blob - i.e. limits the amount of data you can put into your JobDataMap
--
-DROP TABLE QRTZ_JOB_LISTENERS;
-DROP TABLE QRTZ_TRIGGER_LISTENERS;
-DROP TABLE QRTZ_FIRED_TRIGGERS;
-DROP TABLE QRTZ_PAUSED_TRIGGER_GRPS;
-DROP TABLE QRTZ_SCHEDULER_STATE;
-DROP TABLE QRTZ_LOCKS;
-DROP TABLE QRTZ_SIMPLE_TRIGGERS;
-DROP TABLE QRTZ_CRON_TRIGGERS;
-DROP TABLE QRTZ_TRIGGERS;
-DROP TABLE QRTZ_JOB_DETAILS;
-DROP TABLE QRTZ_CALENDARS;
-DROP TABLE QRTZ_BLOB_TRIGGERS;
-
create table qrtz_job_details (
job_name varchar(80) not null,
job_group varchar(80) not null,
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_db2_v8.sql
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_db2_v8.sql 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_db2_v8.sql 2009-07-02 18:58:02 UTC (rev 27454)
@@ -8,19 +8,6 @@
#
-DROP TABLE QRTZ_JOB_LISTENERS;
-DROP TABLE QRTZ_TRIGGER_LISTENERS;
-DROP TABLE QRTZ_FIRED_TRIGGERS;
-DROP TABLE QRTZ_PAUSED_TRIGGER_GRPS;
-DROP TABLE QRTZ_SCHEDULER_STATE;
-DROP TABLE QRTZ_LOCKS;
-DROP TABLE QRTZ_SIMPLE_TRIGGERS;
-DROP TABLE QRTZ_CRON_TRIGGERS;
-DROP TABLE QRTZ_TRIGGERS;
-DROP TABLE QRTZ_JOB_DETAILS;
-DROP TABLE QRTZ_CALENDARS;
-DROP TABLE QRTZ_BLOB_TRIGGERS;
-
create table qrtz_job_details(
job_name varchar(80) not null,
job_group varchar(80) not null,
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_firebird.sql
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_firebird.sql 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_firebird.sql 2009-07-02 18:58:02 UTC (rev 27454)
@@ -4,20 +4,6 @@
--
-DROP TABLE QRTZ_JOB_LISTENERS;
-DROP TABLE QRTZ_TRIGGER_LISTENERS;
-DROP TABLE QRTZ_FIRED_TRIGGERS;
-DROP TABLE QRTZ_PAUSED_TRIGGER_GRPS;
-DROP TABLE QRTZ_SCHEDULER_STATE;
-DROP TABLE QRTZ_LOCKS;
-DROP TABLE QRTZ_SIMPLE_TRIGGERS;
-DROP TABLE QRTZ_CRON_TRIGGERS;
-DROP TABLE QRTZ_BLOB_TRIGGERS;
-DROP TABLE QRTZ_TRIGGERS;
-DROP TABLE QRTZ_JOB_DETAILS;
-DROP TABLE QRTZ_CALENDARS;
-
-
CREATE TABLE QRTZ_JOB_DETAILS (
JOB_NAME VARCHAR(60) NOT NULL,
JOB_GROUP VARCHAR(60) NOT NULL,
Copied: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_h2.sql (from rev 27451, labs/jbossesb/tags/JBESB_4_4_GA_CP3_CR3/product/services/jbpm/src/main/resources/quartz-sql/tables_h2.sql)
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_h2.sql (rev 0)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_h2.sql 2009-07-02 18:58:02 UTC (rev 27454)
@@ -0,0 +1,144 @@
+#
+# In your Quartz properties file, you'll need to set
+# org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.HSQLDBDelegate
+#
+
+CREATE TABLE qrtz_job_details
+(
+JOB_NAME VARCHAR(80) NOT NULL,
+JOB_GROUP VARCHAR(80) NOT NULL,
+DESCRIPTION VARCHAR(120) NULL,
+JOB_CLASS_NAME VARCHAR(128) NOT NULL,
+IS_DURABLE VARCHAR(5) NOT NULL,
+IS_VOLATILE VARCHAR(5) NOT NULL,
+IS_STATEFUL VARCHAR(5) NOT NULL,
+REQUESTS_RECOVERY VARCHAR(5) NOT NULL,
+JOB_DATA BINARY NULL,
+PRIMARY KEY (JOB_NAME,JOB_GROUP)
+);
+
+CREATE TABLE qrtz_job_listeners
+(
+JOB_NAME VARCHAR(80) NOT NULL,
+JOB_GROUP VARCHAR(80) NOT NULL,
+JOB_LISTENER VARCHAR(80) NOT NULL,
+PRIMARY KEY (JOB_NAME,JOB_GROUP,JOB_LISTENER),
+FOREIGN KEY (JOB_NAME,JOB_GROUP)
+REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)
+);
+
+CREATE TABLE qrtz_triggers
+(
+TRIGGER_NAME VARCHAR(80) NOT NULL,
+TRIGGER_GROUP VARCHAR(80) NOT NULL,
+JOB_NAME VARCHAR(80) NOT NULL,
+JOB_GROUP VARCHAR(80) NOT NULL,
+IS_VOLATILE VARCHAR(5) NOT NULL,
+DESCRIPTION VARCHAR(120) NULL,
+NEXT_FIRE_TIME NUMERIC(13) NULL,
+PREV_FIRE_TIME NUMERIC(13) NULL,
+TRIGGER_STATE VARCHAR(16) NOT NULL,
+TRIGGER_TYPE VARCHAR(8) NOT NULL,
+START_TIME NUMERIC(13) NOT NULL,
+END_TIME NUMERIC(13) NULL,
+CALENDAR_NAME VARCHAR(80) NULL,
+MISFIRE_INSTR NUMERIC(2) NULL,
+JOB_DATA BINARY NULL,
+PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP),
+FOREIGN KEY (JOB_NAME,JOB_GROUP)
+REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP)
+);
+
+CREATE TABLE qrtz_simple_triggers
+(
+TRIGGER_NAME VARCHAR(80) NOT NULL,
+TRIGGER_GROUP VARCHAR(80) NOT NULL,
+REPEAT_COUNT NUMERIC(7) NOT NULL,
+REPEAT_INTERVAL NUMERIC(12) NOT NULL,
+TIMES_TRIGGERED NUMERIC(7) NOT NULL,
+PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP),
+FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP)
+REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)
+);
+
+CREATE TABLE qrtz_cron_triggers
+(
+TRIGGER_NAME VARCHAR(80) NOT NULL,
+TRIGGER_GROUP VARCHAR(80) NOT NULL,
+CRON_EXPRESSION VARCHAR(80) NOT NULL,
+TIME_ZONE_ID VARCHAR(80),
+PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP),
+FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP)
+REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)
+);
+
+CREATE TABLE qrtz_blob_triggers
+(
+TRIGGER_NAME VARCHAR(80) NOT NULL,
+TRIGGER_GROUP VARCHAR(80) NOT NULL,
+BLOB_DATA BINARY NULL,
+PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP),
+FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP)
+REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)
+);
+
+CREATE TABLE qrtz_trigger_listeners
+(
+TRIGGER_NAME VARCHAR(80) NOT NULL,
+TRIGGER_GROUP VARCHAR(80) NOT NULL,
+TRIGGER_LISTENER VARCHAR(80) NOT NULL,
+PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_LISTENER),
+FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP)
+REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP)
+);
+
+CREATE TABLE qrtz_calendars
+(
+CALENDAR_NAME VARCHAR(80) NOT NULL,
+CALENDAR BINARY NOT NULL,
+PRIMARY KEY (CALENDAR_NAME)
+);
+
+CREATE TABLE qrtz_paused_trigger_grps
+(
+TRIGGER_GROUP VARCHAR(80) NOT NULL,
+PRIMARY KEY (TRIGGER_GROUP)
+);
+
+CREATE TABLE qrtz_fired_triggers
+(
+ENTRY_ID VARCHAR(95) NOT NULL,
+TRIGGER_NAME VARCHAR(80) NOT NULL,
+TRIGGER_GROUP VARCHAR(80) NOT NULL,
+IS_VOLATILE VARCHAR(5) NOT NULL,
+INSTANCE_NAME VARCHAR(80) NOT NULL,
+FIRED_TIME NUMERIC(13) NOT NULL,
+STATE VARCHAR(16) NOT NULL,
+JOB_NAME VARCHAR(80) NULL,
+JOB_GROUP VARCHAR(80) NULL,
+IS_STATEFUL VARCHAR(5) NULL,
+REQUESTS_RECOVERY VARCHAR(5) NULL,
+PRIMARY KEY (ENTRY_ID)
+);
+
+CREATE TABLE qrtz_scheduler_state
+(
+INSTANCE_NAME VARCHAR(80) NOT NULL,
+LAST_CHECKIN_TIME NUMERIC(13) NOT NULL,
+CHECKIN_INTERVAL NUMERIC(13) NOT NULL,
+RECOVERER VARCHAR(80) NULL,
+PRIMARY KEY (INSTANCE_NAME)
+);
+
+CREATE TABLE qrtz_locks
+(
+LOCK_NAME VARCHAR(40) NOT NULL,
+PRIMARY KEY (LOCK_NAME)
+);
+
+INSERT INTO qrtz_locks values('TRIGGER_ACCESS');
+INSERT INTO qrtz_locks values('JOB_ACCESS');
+INSERT INTO qrtz_locks values('CALENDAR_ACCESS');
+INSERT INTO qrtz_locks values('STATE_ACCESS');
+INSERT INTO qrtz_locks values('MISFIRE_ACCESS');
+
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_hsqldb.sql
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_hsqldb.sql 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_hsqldb.sql 2009-07-02 18:58:02 UTC (rev 27454)
@@ -3,19 +3,6 @@
# org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.HSQLDBDelegate
#
-DROP TABLE qrtz_locks IF EXISTS;
-DROP TABLE qrtz_scheduler_state IF EXISTS;
-DROP TABLE qrtz_fired_triggers IF EXISTS;
-DROP TABLE qrtz_paused_trigger_grps IF EXISTS;
-DROP TABLE qrtz_calendars IF EXISTS;
-DROP TABLE qrtz_trigger_listeners IF EXISTS;
-DROP TABLE qrtz_blob_triggers IF EXISTS;
-DROP TABLE qrtz_cron_triggers IF EXISTS;
-DROP TABLE qrtz_simple_triggers IF EXISTS;
-DROP TABLE qrtz_triggers IF EXISTS;
-DROP TABLE qrtz_job_listeners IF EXISTS;
-DROP TABLE qrtz_job_details IF EXISTS;
-
CREATE TABLE qrtz_job_details
(
JOB_NAME VARCHAR(80) NOT NULL,
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_mysql.sql
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_mysql.sql 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_mysql.sql 2009-07-02 18:58:02 UTC (rev 27454)
@@ -5,20 +5,7 @@
# org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
#
-DROP TABLE IF EXISTS QRTZ_JOB_LISTENERS;
-DROP TABLE IF EXISTS QRTZ_TRIGGER_LISTENERS;
-DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;
-DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE;
-DROP TABLE IF EXISTS QRTZ_LOCKS;
-DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
-DROP TABLE IF EXISTS QRTZ_CALENDARS;
-
CREATE TABLE QRTZ_JOB_DETAILS
(
JOB_NAME VARCHAR(80) NOT NULL,
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_mysql_innodb.sql
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_mysql_innodb.sql 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_mysql_innodb.sql 2009-07-02 18:58:02 UTC (rev 27454)
@@ -6,18 +6,6 @@
# By: Ron Cordell - roncordell
# I didn't see this anywhere, so I thought I'd post it here. This is the script from Quartz to create the tables in a MySQL database, modified to use INNODB instead of MYISAM.
-DROP TABLE IF EXISTS QRTZ_JOB_LISTENERS;
-DROP TABLE IF EXISTS QRTZ_TRIGGER_LISTENERS;
-DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;
-DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE;
-DROP TABLE IF EXISTS QRTZ_LOCKS;
-DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
-DROP TABLE IF EXISTS QRTZ_CALENDARS;
CREATE TABLE QRTZ_JOB_DETAILS(
JOB_NAME VARCHAR(80) NOT NULL,
JOB_GROUP VARCHAR(80) NOT NULL,
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_oracle.sql
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_oracle.sql 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_oracle.sql 2009-07-02 18:58:02 UTC (rev 27454)
@@ -5,33 +5,7 @@
-- Oracle install, so most users need not worry about this.
--
-delete from qrtz_job_listeners;
-delete from qrtz_trigger_listeners;
-delete from qrtz_fired_triggers;
-delete from qrtz_simple_triggers;
-delete from qrtz_cron_triggers;
-delete from qrtz_blob_triggers;
-delete from qrtz_triggers;
-delete from qrtz_job_details;
-delete from qrtz_calendars;
-delete from qrtz_paused_trigger_grps;
-delete from qrtz_locks;
-delete from qrtz_scheduler_state;
-drop table qrtz_calendars;
-drop table qrtz_fired_triggers;
-drop table qrtz_trigger_listeners;
-drop table qrtz_blob_triggers;
-drop table qrtz_cron_triggers;
-drop table qrtz_simple_triggers;
-drop table qrtz_triggers;
-drop table qrtz_job_listeners;
-drop table qrtz_job_details;
-drop table qrtz_paused_trigger_grps;
-drop table qrtz_locks;
-drop table qrtz_scheduler_state;
-
-
CREATE TABLE qrtz_job_details
(
JOB_NAME VARCHAR2(80) NOT NULL,
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_pointbase.sql
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_pointbase.sql 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_pointbase.sql 2009-07-02 18:58:02 UTC (rev 27454)
@@ -7,31 +7,6 @@
# if you will be storing large amounts of data in them
#
#
-delete from qrtz_job_listeners;
-delete from qrtz_trigger_listeners;
-delete from qrtz_fired_triggers;
-delete from qrtz_simple_triggers;
-delete from qrtz_cron_triggers;
-delete from qrtz_blob_triggers;
-delete from qrtz_triggers;
-delete from qrtz_job_details;
-delete from qrtz_calendars;
-delete from qrtz_paused_trigger_grps;
-delete from qrtz_locks;
-delete from qrtz_scheduler_state;
-
-drop table qrtz_calendars;
-drop table qrtz_fired_triggers;
-drop table qrtz_trigger_listeners;
-drop table qrtz_blob_triggers;
-drop table qrtz_cron_triggers;
-drop table qrtz_simple_triggers;
-drop table qrtz_triggers;
-drop table qrtz_job_listeners;
-drop table qrtz_job_details;
-drop table qrtz_paused_trigger_grps;
-drop table qrtz_locks;
-drop table qrtz_scheduler_state;
CREATE TABLE qrtz_job_details
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_postgres.sql
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_postgres.sql 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_postgres.sql 2009-07-02 18:58:02 UTC (rev 27454)
@@ -3,18 +3,6 @@
-- In your Quartz properties file, you'll need to set
-- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.PostreSQLDelegate
-drop table qrtz_job_listeners;
-drop table qrtz_trigger_listeners;
-drop table qrtz_fired_triggers;
-DROP TABLE QRTZ_PAUSED_TRIGGER_GRPS;
-DROP TABLE QRTZ_SCHEDULER_STATE;
-DROP TABLE QRTZ_LOCKS;
-drop table qrtz_simple_triggers;
-drop table qrtz_cron_triggers;
-DROP TABLE QRTZ_BLOB_TRIGGERS;
-drop table qrtz_triggers;
-drop table qrtz_job_details;
-drop table qrtz_calendars;
CREATE TABLE qrtz_job_details
(
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_postgres7.sql
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_postgres7.sql 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_postgres7.sql 2009-07-02 18:58:02 UTC (rev 27454)
@@ -3,18 +3,6 @@
-- In your Quartz properties file, you'll need to set
-- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.PostreSQLDelegate
-drop table qrtz_job_listeners;
-drop table qrtz_trigger_listeners;
-drop table qrtz_fired_triggers;
-DROP TABLE QRTZ_PAUSED_TRIGGER_GRPS;
-DROP TABLE QRTZ_SCHEDULER_STATE;
-DROP TABLE QRTZ_LOCKS;
-drop table qrtz_simple_triggers;
-drop table qrtz_cron_triggers;
-DROP TABLE QRTZ_BLOB_TRIGGERS;
-drop table qrtz_triggers;
-drop table qrtz_job_details;
-drop table qrtz_calendars;
CREATE TABLE qrtz_job_details
(
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_sqlServer.sql
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_sqlServer.sql 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_sqlServer.sql 2009-07-02 18:58:02 UTC (rev 27454)
@@ -24,77 +24,6 @@
--# JTDS driver
--#
-USE [enter_db_name_here]
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_JOB_LISTENERS_QRTZ_JOB_DETAILS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
-ALTER TABLE [dbo].[QRTZ_JOB_LISTENERS] DROP CONSTRAINT FK_QRTZ_JOB_LISTENERS_QRTZ_JOB_DETAILS
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
-ALTER TABLE [dbo].[QRTZ_TRIGGERS] DROP CONSTRAINT FK_QRTZ_TRIGGERS_QRTZ_JOB_DETAILS
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
-ALTER TABLE [dbo].[QRTZ_CRON_TRIGGERS] DROP CONSTRAINT FK_QRTZ_CRON_TRIGGERS_QRTZ_TRIGGERS
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
-ALTER TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS] DROP CONSTRAINT FK_QRTZ_SIMPLE_TRIGGERS_QRTZ_TRIGGERS
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[FK_QRTZ_TRIGGER_LISTENERS_QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISFOREIGNKEY') = 1)
-ALTER TABLE [dbo].[QRTZ_TRIGGER_LISTENERS] DROP CONSTRAINT FK_QRTZ_TRIGGER_LISTENERS_QRTZ_TRIGGERS
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_CALENDARS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
-DROP TABLE [dbo].[QRTZ_CALENDARS]
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_CRON_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
-DROP TABLE [dbo].[QRTZ_CRON_TRIGGERS]
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_BLOB_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
-DROP TABLE [dbo].[QRTZ_BLOB_TRIGGERS]
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_FIRED_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
-DROP TABLE [dbo].[QRTZ_FIRED_TRIGGERS]
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_PAUSED_TRIGGER_GRPS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
-DROP TABLE [dbo].[QRTZ_PAUSED_TRIGGER_GRPS]
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_SCHEDULER_STATE]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
-DROP TABLE [dbo].[QRTZ_SCHEDULER_STATE]
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_LOCKS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
-DROP TABLE [dbo].[QRTZ_LOCKS]
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_JOB_DETAILS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
-DROP TABLE [dbo].[QRTZ_JOB_DETAILS]
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_JOB_LISTENERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
-DROP TABLE [dbo].[QRTZ_JOB_LISTENERS]
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_SIMPLE_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
-DROP TABLE [dbo].[QRTZ_SIMPLE_TRIGGERS]
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_TRIGGER_LISTENERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
-DROP TABLE [dbo].[QRTZ_TRIGGER_LISTENERS]
-GO
-
-IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[dbo].[QRTZ_TRIGGERS]') AND OBJECTPROPERTY(id, N'ISUSERTABLE') = 1)
-DROP TABLE [dbo].[QRTZ_TRIGGERS]
-GO
-
CREATE TABLE [dbo].[QRTZ_CALENDARS] (
[CALENDAR_NAME] [VARCHAR] (80) NOT NULL ,
[CALENDAR] [IMAGE] NOT NULL
Modified: labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_sybase.sql
===================================================================
--- labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_sybase.sql 2009-07-02 18:18:17 UTC (rev 27453)
+++ labs/jbossesb/workspace/platform/JBESB_4_4_SOA_4_3_GA/product/services/jbpm/src/main/resources/quartz-sql/tables_sybase.sql 2009-07-02 18:58:02 UTC (rev 27454)
@@ -9,96 +9,7 @@
/* org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.MSSQLDelegate */
/*==============================================================================================*/
-use your_db_name_here
-go
-
/*==============================================================================*/
-/* Clear all tables: */
-/*==============================================================================*/
-
-delete from QRTZ_JOB_LISTENERS
-go
-delete from QRTZ_TRIGGER_LISTENERS
-go
-delete from QRTZ_FIRED_TRIGGERS
-go
-delete from QRTZ_PAUSED_TRIGGER_GRPS
-go
-delete from QRTZ_SCHEDULER_STATE
-go
-delete from QRTZ_LOCKS
-go
-delete from QRTZ_SIMPLE_TRIGGERS
-go
-delete from QRTZ_CRON_TRIGGERS
-go
-delete from QRTZ_BLOB_TRIGGERS
-go
-delete from QRTZ_TRIGGERS
-go
-delete from QRTZ_JOB_DETAILS
-go
-delete from QRTZ_CALENDARS
-go
-
-/*==============================================================================*/
-/* Drop constraints: */
-/*==============================================================================*/
-
-alter table QRTZ_JOB_LISTENERS
-drop constraint FK_job_listeners_job_details
-go
-
-alter table QRTZ_TRIGGERS
-drop constraint FK_triggers_job_details
-go
-
-alter table QRTZ_CRON_TRIGGERS
-drop constraint FK_cron_triggers_triggers
-go
-
-alter table QRTZ_SIMPLE_TRIGGERS
-drop constraint FK_simple_triggers_triggers
-go
-
-alter table QRTZ_TRIGGER_LISTENERS
-drop constraint FK_trigger_listeners_triggers
-go
-
-alter table QRTZ_BLOB_TRIGGERS
-drop constraint FK_blob_triggers_triggers
-go
-
-/*==============================================================================*/
-/* Drop tables: */
-/*==============================================================================*/
-
-drop table QRTZ_JOB_LISTENERS
-go
-drop table QRTZ_TRIGGER_LISTENERS
-go
-drop table QRTZ_FIRED_TRIGGERS
-go
-drop table QRTZ_PAUSED_TRIGGER_GRPS
-go
-drop table QRTZ_SCHEDULER_STATE
-go
-drop table QRTZ_LOCKS
-go
-drop table QRTZ_SIMPLE_TRIGGERS
-go
-drop table QRTZ_CRON_TRIGGERS
-go
-drop table QRTZ_BLOB_TRIGGERS
-go
-drop table QRTZ_TRIGGERS
-go
-drop table QRTZ_JOB_DETAILS
-go
-drop table QRTZ_CALENDARS
-go
-
-/*==============================================================================*/
/* Create tables: */
/*==============================================================================*/
More information about the jboss-svn-commits
mailing list