[portal-commits] JBoss Portal SVN: r11236 - in branches/JBoss_Portal_Branch_2_7/workflow/src: resources/portal-workflow-sar/META-INF and 1 other directory.

Author: thomas.heute(a)jboss.com Date: 2008-07-01 15:53:10 -0400 (Tue, 01 Jul 2008) New Revision: 11236 Modified: branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadServiceMBean.java branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml Log: Tested scheduler service, cleaned up unused stuff Modified: branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java 2008-07-01 17:53:31 UTC (rev 11235) +++ branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java 2008-07-01 19:53:10 UTC (rev 11236) @@ -23,10 +23,6 @@ package org.jboss.portal.workflow.service; import org.jbpm.JbpmConfiguration; -/* -import org.jbpm.msg.command.CommandExecutorThread; -import org.jbpm.scheduler.impl.SchedulerThread; -*/ /** * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> @@ -35,31 +31,12 @@ public class JbpmThreadService implements JbpmThreadServiceMBean { - private int schedulerInterval = 5000; - - private int priority = 1; - private WorkflowService workflowService = null; - /*private CommandExecutorThread commandExecutorThread = null; - - private SchedulerThread schedulerThread = null;*/ - public void start() { JbpmConfiguration jbpmConfiguration = workflowService.getJbpmConfiguration(); - jbpmConfiguration.getJobExecutor().start(); - -/* - commandExecutorThread = new CommandExecutorThread(jbpmConfiguration); - commandExecutorThread.setPriority(priority); - commandExecutorThread.start(); - - schedulerThread = new SchedulerThread(jbpmConfiguration); - schedulerThread.setPriority(priority); - schedulerThread.setInterval(schedulerInterval); - schedulerThread.start();*/ } public void stop() @@ -67,26 +44,6 @@ workflowService.getJbpmConfiguration().getJobExecutor().stop(); } - public int getSchedulerInterval() - { - return schedulerInterval; - } - - public void setSchedulerInterval(int schedulerInterval) - { - this.schedulerInterval = schedulerInterval; - } - - public int getPriority() - { - return priority; - } - - public void setPriority(int priority) - { - this.priority = priority; - } - public WorkflowService getWorkflowService() { return workflowService; Modified: branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadServiceMBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadServiceMBean.java 2008-07-01 17:53:31 UTC (rev 11235) +++ branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadServiceMBean.java 2008-07-01 19:53:10 UTC (rev 11236) @@ -36,13 +36,5 @@ public WorkflowService getWorkflowService(); public void setWorkflowService(WorkflowService workflowService); - - public int getSchedulerInterval(); - - public void setSchedulerInterval(int schedulerInterval); - - public int getPriority(); - - public void setPriority(int priority); } Modified: branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2008-07-01 17:53:31 UTC (rev 11235) +++ branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2008-07-01 19:53:10 UTC (rev 11236) @@ -34,15 +34,12 @@ <attribute name="JNDIName">java:/portal/workflow/WorkFlowSessionFactory</attribute> </mbean> -<!-- <mbean code="org.jboss.portal.workflow.service.JbpmThreadService" name="portal:service=Thread,type=WorkflowService"> <depends optional-attribute-name="WorkflowService" proxy-type="attribute"> portal:service=Workflow,type=WorkflowService </depends> - <attribute name="SchedulerInterval">60000</attribute> </mbean> - --> <!-- Workflow service --> <mbean code="org.jboss.portal.workflow.service.WorkflowServiceImpl"