[jbpm-commits] JBoss JBPM SVN: r5450 - jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/exe/converter and 27 other directories.

Author: alex.guizar(a)jboss.com Date: 2009-08-08 05:24:45 -0400 (Sat, 08 Aug 2009) New Revision: 5450 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/AbstractBaseCommand.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/UnlockTokenCommand.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/log/VariableUpdateLog.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/def/MultipleProcessDefinitionEventsDbTest.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/exe/StateDbTest.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java jbpm3/branches/jbpm-3.2-soa/modules/identity/src/main/java/org/jbpm/identity/hibernate/IdentitySession.java jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/IdentityDbTestCase.java jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/assignment/ExpressionAssignmentHandlerTest.java jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/hibernate/GroupDbTest.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/EmptyAction.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartTaskAndPlanCompletion.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartWorkOnStateAndPlanCompletion.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/GetSimulationInputCommand.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/HistorialProcessVariableSource.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataFilterAction.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataSourceAction.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/DefaultJbpmSimulationModel.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationClock.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationScenario.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/entity/ResourceUsingEntity.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/ProcessStartEventGenerator.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/StatisticsResetEvent.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/JbpmSimulationExperimentRunner.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimAction.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimState.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimTaskNode.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimulationJpdlXmlReader.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/kpi/BusinessFigureAction.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/InMemoryOutput.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/CountResult.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/QueueStatisticsResult.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/TimeSeriesResult.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/UtilizationStatisticsResult.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioComparisionReport.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioDetailsReport.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/CoreLibrary.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/GetVariableMapActionListener.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/LazyJbpmActionListener.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListProcessInstancesActionListener.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessActionListener.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessInstanceActionListener.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTokensActionListener.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/StartProcessActionListener.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/AbstractHandler.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/CancelHandler.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/GetVariableHandler.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/ListProcessInstancesHandler.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/RemoveVariableHandler.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/SignalHandler.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/UpdateVariableHandler.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/phase/JbpmPhaseListener.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataArea.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataCell.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataForm.java projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataSection.java Log: fix many eclipse warnings Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/AbstractBaseCommand.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/AbstractBaseCommand.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/AbstractBaseCommand.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,23 +1,24 @@ package org.jbpm.command; +import org.jbpm.util.ClassUtil; /** - * Base class for all internal commands. Implements some - * convenience methods for {@link Command}s and generic toString - * method. + * Base class for all internal commands. Implements some convenience methods for {@link Command}s + * and generic toString method. * * @author bernd.ruecker(a)camunda.com */ -public abstract class AbstractBaseCommand implements Command -{ +public abstract class AbstractBaseCommand implements Command { + + private static final long serialVersionUID = 1L; + public String toString() { - return this.getClass().getName() - + " [" - + getAdditionalToStringInformation() - + "]"; - } + String className = ClassUtil.getSimpleName(getClass()); + String additionalInfo = getAdditionalToStringInformation(); + return additionalInfo != null ? className + '[' + additionalInfo + ']' : className; + } - public String getAdditionalToStringInformation() { - return ""; + protected String getAdditionalToStringInformation() { + return null; } } Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -28,12 +28,6 @@ */ private long processInstanceId; - /** - * NOT YET USED! JUST TO DOCUMENT THE IDEA... result of the Command: a gui element, configured via - * the TaskController. Can be used to identify a Swing-Class, JSF-Site, ... - */ - private String configuredGuiElement; - public GetTaskInstanceCommand() { } Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/UnlockTokenCommand.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/UnlockTokenCommand.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/UnlockTokenCommand.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,6 +1,5 @@ package org.jbpm.command; -import org.jbpm.JbpmContext; import org.jbpm.graph.exe.Token; /** Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/exe/converter/SerializableToByteArrayConverter.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -34,7 +34,6 @@ import org.jbpm.bytes.ByteArray; import org.jbpm.context.exe.Converter; import org.jbpm.graph.def.ProcessDefinition; -import org.jbpm.util.ClassLoaderUtil; import org.jbpm.util.CustomLoaderObjectInputStream; public class SerializableToByteArrayConverter implements Converter { Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/log/VariableUpdateLog.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/log/VariableUpdateLog.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/context/log/VariableUpdateLog.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -21,10 +21,12 @@ */ package org.jbpm.context.log; -import org.jbpm.context.exe.*; +import org.jbpm.context.exe.VariableInstance; public abstract class VariableUpdateLog extends VariableLog { - + + private static final long serialVersionUID = 1L; + public VariableUpdateLog() { } Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -39,7 +39,7 @@ public class JobSession { - private final Session session; + final Session session; public JobSession(Session session) { this.session = session; Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/persistence/db/DbPersistenceService.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -159,7 +159,6 @@ DataSource dataSource = persistenceServiceFactory.getDataSource(); if (dataSource != null) { try { - log.debug("establishing connection to data source"); connection = dataSource.getConnection(); mustConnectionBeClosed = true; } @@ -297,7 +296,7 @@ } } else { - log.warn("jdbc connection was already closed"); + log.warn("no jdbc connection to close"); } } return null; Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/def/MultipleProcessDefinitionEventsDbTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/def/MultipleProcessDefinitionEventsDbTest.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/def/MultipleProcessDefinitionEventsDbTest.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -25,7 +25,6 @@ import org.jbpm.db.AbstractDbTestCase; import org.jbpm.graph.node.State; -import org.jbpm.taskmgmt.def.Task; public class MultipleProcessDefinitionEventsDbTest extends AbstractDbTestCase { Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/exe/StateDbTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/exe/StateDbTest.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/graph/exe/StateDbTest.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -2,7 +2,6 @@ import org.jbpm.db.AbstractDbTestCase; import org.jbpm.graph.def.ProcessDefinition; -import org.jbpm.taskmgmt.def.Task; public final class StateDbTest extends AbstractDbTestCase { Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/scheduler/exe/SchedulerTest.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -43,9 +43,11 @@ public static class TestSchedulerServiceFactory implements ServiceFactory { private static final long serialVersionUID = 1L; + public Service openService() { return new TestSchedulerService(); } + public void close() { } } @@ -54,93 +56,97 @@ List createdTimers = new ArrayList(); List cancelledTimersByName = new ArrayList(); List cancelledTimersByProcessInstance = new ArrayList(); - + private static final long serialVersionUID = 1L; + public void createTimer(Timer timer) { createdTimers.add(timer); } + public void deleteTimer(Timer timer) { - cancelledTimersByName.add(new Object[]{timer.getName(), timer.getToken()}); + cancelledTimersByName.add(new Object[] { timer.getName(), timer.getToken() }); } + public void deleteTimersByName(String timerName, Token token) { - cancelledTimersByName.add(new Object[]{timerName, token}); + cancelledTimersByName.add(new Object[] { timerName, token }); } + public void deleteTimersByProcessInstance(ProcessInstance processInstance) { cancelledTimersByProcessInstance.add(processInstance); } + public void close() { } } - static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString( - "<jbpm-configuration>" + - " <jbpm-context>" + - " <service name='scheduler' factory='org.jbpm.scheduler.exe.SchedulerTest$TestSchedulerServiceFactory' />" + - " </jbpm-context>" + - " <bean name='jbpm.task.instance.factory' class='org.jbpm.taskmgmt.impl.DefaultTaskInstanceFactoryImpl' singleton='true' />" + - "</jbpm-configuration>" - ); - + static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.parseXmlString("<jbpm-configuration>" + + " <jbpm-context>" + + " <service name='scheduler' factory='org.jbpm.scheduler.exe.SchedulerTest$TestSchedulerServiceFactory' />" + + " </jbpm-context>" + + " <bean name='jbpm.task.instance.factory' class='org.jbpm.taskmgmt.impl.DefaultTaskInstanceFactoryImpl' singleton='true' />" + + "</jbpm-configuration>"); + public void testTimerCreation() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='catch crooks' />" + - " </start-state>" + - " <state name='catch crooks'>" + - " <timer name='reminder' " + - " duedate='3 business hours' " + - " transition='time-out-transition' >" + - " <action class='the-remainder-action-class-name' />" + - " </timer>" + - " </state>" + - "</process-definition>" - ); + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='catch crooks' />" + + " </start-state>" + + " <state name='catch crooks'>" + + " <timer name='reminder' " + + " duedate='3 business hours' " + + " transition='time-out-transition' >" + + " <action class='the-remainder-action-class-name' />" + + " </timer>" + + " </state>" + + "</process-definition>"); JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService(); - + TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices() + .getSchedulerService(); + ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.signal(); - + assertEquals(1, testSchedulerService.createdTimers.size()); Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0); assertEquals("reminder", scheduledTimer.getName()); assertEquals(processDefinition.getNode("catch crooks"), scheduledTimer.getGraphElement()); // System.out.println("due date: "+scheduledTimer.getDueDate()); assertNotNull(scheduledTimer.getDueDate()); - assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName()); + assertEquals("the-remainder-action-class-name", scheduledTimer.getAction() + .getActionDelegation() + .getClassName()); assertSame(processInstance.getRootToken(), scheduledTimer.getToken()); assertEquals("time-out-transition", scheduledTimer.getTransitionName()); - } finally { + } + finally { jbpmContext.close(); } } public void testTimerCreationRepeat() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='catch crooks' />" + - " </start-state>" + - " <state name='catch crooks'>" + - " <timer name='reminder' " + - " duedate='3 business hours' " + - " repeat='10 business minutes' >" + - " <action class='the-remainder-action-class-name' />" + - " </timer>" + - " </state>" + - "</process-definition>" - ); + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='catch crooks' />" + + " </start-state>" + + " <state name='catch crooks'>" + + " <timer name='reminder' " + + " duedate='3 business hours' " + + " repeat='10 business minutes' >" + + " <action class='the-remainder-action-class-name' />" + + " </timer>" + + " </state>" + + "</process-definition>"); JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService(); - + TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices() + .getSchedulerService(); + ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.signal(); - + assertEquals(1, testSchedulerService.createdTimers.size()); Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0); assertEquals("reminder", scheduledTimer.getName()); @@ -148,86 +154,90 @@ // System.out.println("due date: "+scheduledTimer.getDueDate()); assertNotNull(scheduledTimer.getDueDate()); assertEquals("10 business minutes", scheduledTimer.getRepeat()); - assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName()); + assertEquals("the-remainder-action-class-name", scheduledTimer.getAction() + .getActionDelegation() + .getClassName()); assertSame(processInstance.getRootToken(), scheduledTimer.getToken()); - } finally { + } + finally { jbpmContext.close(); } } public void testCreateTimerAction() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='catch crooks' />" + - " </start-state>" + - " <state name='catch crooks'>" + - " <event type='node-enter'>" + - " <create-timer name='reminder' " + - " duedate='3 business hours' " + - " transition='time-out-transition' >" + - " <action class='the-remainder-action-class-name' />" + - " </create-timer>" + - " </event>" + - " <transition to='end'/>" + - " </state>" + - " <end-state name='end'/>" + - "</process-definition>" - ); - + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='catch crooks' />" + + " </start-state>" + + " <state name='catch crooks'>" + + " <event type='node-enter'>" + + " <create-timer name='reminder' " + + " duedate='3 business hours' " + + " transition='time-out-transition' >" + + " <action class='the-remainder-action-class-name' />" + + " </create-timer>" + + " </event>" + + " <transition to='end'/>" + + " </state>" + + " <end-state name='end'/>" + + "</process-definition>"); + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService(); - + TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices() + .getSchedulerService(); + ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.signal(); - + assertEquals(1, testSchedulerService.createdTimers.size()); Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0); assertEquals("reminder", scheduledTimer.getName()); assertEquals(processDefinition.getNode("catch crooks"), scheduledTimer.getGraphElement()); // System.out.println("due date: "+scheduledTimer.getDueDate()); assertNotNull(scheduledTimer.getDueDate()); - assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName()); + assertEquals("the-remainder-action-class-name", scheduledTimer.getAction() + .getActionDelegation() + .getClassName()); assertSame(processInstance.getRootToken(), scheduledTimer.getToken()); assertEquals("time-out-transition", scheduledTimer.getTransitionName()); - + // while we are at it, i might as well check if the cancel timer is not executed ;) processInstance.signal(); assertEquals(0, testSchedulerService.cancelledTimersByName.size()); - - } finally { + + } + finally { jbpmContext.close(); } } public void testCreateTimerActionRepeat() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='catch crooks' />" + - " </start-state>" + - " <state name='catch crooks'>" + - " <event type='node-enter'>" + - " <create-timer name='reminder' " + - " duedate='3 business hours' " + - " repeat='10 business minutes'>" + - " <action class='the-remainder-action-class-name' />" + - " </create-timer>" + - " </event>" + - " <transition to='end'/>" + - " </state>" + - " <end-state name='end'/>" + - "</process-definition>" - ); - + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='catch crooks' />" + + " </start-state>" + + " <state name='catch crooks'>" + + " <event type='node-enter'>" + + " <create-timer name='reminder' " + + " duedate='3 business hours' " + + " repeat='10 business minutes'>" + + " <action class='the-remainder-action-class-name' />" + + " </create-timer>" + + " </event>" + + " <transition to='end'/>" + + " </state>" + + " <end-state name='end'/>" + + "</process-definition>"); + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService(); - + TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices() + .getSchedulerService(); + ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.signal(); - + assertEquals(1, testSchedulerService.createdTimers.size()); Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0); assertEquals("reminder", scheduledTimer.getName()); @@ -235,52 +245,55 @@ // System.out.println("due date: "+scheduledTimer.getDueDate()); assertNotNull(scheduledTimer.getDueDate()); assertEquals("10 business minutes", scheduledTimer.getRepeat()); - assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName()); + assertEquals("the-remainder-action-class-name", scheduledTimer.getAction() + .getActionDelegation() + .getClassName()); assertSame(processInstance.getRootToken(), scheduledTimer.getToken()); - + // while we are at it, i might as well check if the cancel timer is not executed ;) processInstance.signal(); assertEquals(0, testSchedulerService.cancelledTimersByName.size()); - - } finally { + + } + finally { jbpmContext.close(); } } public void testTimerCancelAction() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='catch crooks' />" + - " </start-state>" + - " <state name='catch crooks'>" + - " <timer name='reminder' " + - " duedate='3 business hours' " + - " repeat='10 business minutes'" + - " transition='time-out-transition' >" + - " <action class='the-remainder-action-class-name' />" + - " </timer>" + - " <transition to='end'/>" + - " </state>" + - " <end-state name='end'/>" + - "</process-definition>" - ); - + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='catch crooks' />" + + " </start-state>" + + " <state name='catch crooks'>" + + " <timer name='reminder' " + + " duedate='3 business hours' " + + " repeat='10 business minutes'" + + " transition='time-out-transition' >" + + " <action class='the-remainder-action-class-name' />" + + " </timer>" + + " <transition to='end'/>" + + " </state>" + + " <end-state name='end'/>" + + "</process-definition>"); + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService(); - + TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices() + .getSchedulerService(); + ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.signal(); processInstance.signal(); - + List cancelledTimerNames = testSchedulerService.cancelledTimersByName; assertEquals(1, cancelledTimerNames.size()); Object[] cancelledTimer = (Object[]) cancelledTimerNames.get(0); assertEquals("reminder", cancelledTimer[0]); assertSame(processInstance.getRootToken(), cancelledTimer[1]); - - } finally { + + } + finally { jbpmContext.close(); } } @@ -288,100 +301,103 @@ public static class TimerCreateAction implements ActionHandler { private static final long serialVersionUID = 1L; static Timer timer = null; + public void execute(ExecutionContext executionContext) throws Exception { timer = executionContext.getTimer(); } } + public void testTimerEvent() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='catch crooks' />" + - " </start-state>" + - " <state name='catch crooks'>" + - " <event type='timer-create'>" + - " <action class='org.jbpm.scheduler.exe.SchedulerTest$TimerCreateAction' />" + - " </event>" + - " <timer name='reminder' " + - " duedate='2 seconds' >" + - " <action class='the-timer-create-event-class-name' />" + - " </timer>" + - " <transition to='end'/>" + - " </state>" + - " <end-state name='end'/>" + - "</process-definition>" - ); - + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='catch crooks' />" + + " </start-state>" + + " <state name='catch crooks'>" + + " <event type='timer-create'>" + + " <action class='org.jbpm.scheduler.exe.SchedulerTest$TimerCreateAction' />" + + " </event>" + + " <timer name='reminder' " + + " duedate='2 seconds' >" + + " <action class='the-timer-create-event-class-name' />" + + " </timer>" + + " <transition to='end'/>" + + " </state>" + + " <end-state name='end'/>" + + "</process-definition>"); + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { ProcessInstance processInstance = new ProcessInstance(processDefinition); assertNull(TimerCreateAction.timer); processInstance.signal(); assertNotNull(TimerCreateAction.timer); - assertEquals("the-timer-create-event-class-name", TimerCreateAction.timer.getAction().getActionDelegation().getClassName()); + assertEquals("the-timer-create-event-class-name", TimerCreateAction.timer.getAction() + .getActionDelegation() + .getClassName()); - } finally { + } + finally { jbpmContext.close(); } } public void testUnavailableSchedulerService() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='catch crooks' />" + - " </start-state>" + - " <state name='catch crooks'>" + - " <timer name='reminder' " + - " duedate='2 seconds' >" + - " <action class='the-timer-create-event-class-name' />" + - " </timer>" + - " </state>" + - "</process-definition>" - ); - + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='catch crooks' />" + + " </start-state>" + + " <state name='catch crooks'>" + + " <timer name='reminder' " + + " duedate='2 seconds' >" + + " <action class='the-timer-create-event-class-name' />" + + " </timer>" + + " </state>" + + "</process-definition>"); + try { new ProcessInstance(processDefinition).signal(); fail("expected exception"); - } catch (JbpmException e) { + } + catch (JbpmException e) { // OK } } public void testTaskTimerExecution() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='timed task' />" + - " </start-state>" + - " <task-node name='timed task'>" + - " <task name='find the hole in the market'>" + - " <timer duedate='23 business seconds'>" + - " <action class='geftem-eu-shuppe-oender-ze-konte'/>" + - " </timer>" + - " </task>" + - " </task-node>" + - "</process-definition>" - ); - + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='timed task' />" + + " </start-state>" + + " <task-node name='timed task'>" + + " <task name='find the hole in the market'>" + + " <timer duedate='23 business seconds'>" + + " <action class='geftem-eu-shuppe-oender-ze-konte'/>" + + " </timer>" + + " </task>" + + " </task-node>" + + "</process-definition>"); + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService(); + TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices() + .getSchedulerService(); ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.signal(); - + List scheduledTimers = testSchedulerService.createdTimers; assertEquals(1, scheduledTimers.size()); - } finally { + } + finally { jbpmContext.close(); } } - - + static boolean isCustomized = false; + public static class TimerCustomizingAction implements ActionHandler { private static final long serialVersionUID = 1L; + public void execute(ExecutionContext executionContext) throws Exception { assertNotNull(executionContext.getTimer()); assertEquals("reminder", executionContext.getTimer().getName()); @@ -390,64 +406,62 @@ } public void testTaskTimerActionExecution() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='timed task' />" + - " </start-state>" + - " <task-node name='timed task'>" + - " <task name='find the hole in the market'>" + - " <event type='timer-create'>" + - " <action class='org.jbpm.scheduler.exe.SchedulerTest$TimerCustomizingAction' />" + - " </event>" + - " <timer name='reminder' duedate='23 business seconds'>" + - " <action class='geftem-eu-shuppe-oender-ze-konte'/>" + - " </timer>" + - " </task>" + - " </task-node>" + - "</process-definition>" - ); - + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='timed task' />" + + " </start-state>" + + " <task-node name='timed task'>" + + " <task name='find the hole in the market'>" + + " <event type='timer-create'>" + + " <action class='org.jbpm.scheduler.exe.SchedulerTest$TimerCustomizingAction' />" + + " </event>" + + " <timer name='reminder' duedate='23 business seconds'>" + + " <action class='geftem-eu-shuppe-oender-ze-konte'/>" + + " </timer>" + + " </task>" + + " </task-node>" + + "</process-definition>"); + JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.signal(); assertTrue(isCustomized); - } finally { + } + finally { jbpmContext.close(); } } - + public void testTimerELCreation() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='get old' />" + - " </start-state>" + - " <state name='get old'>" + - " <timer name='pension' " + - " duedate='#{dateOfPension}' " + - " transition='time-out-transition' >" + - " <action class='the-remainder-action-class-name' />" + - " </timer>" + - " </state>" + - "</process-definition>" - ); + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='get old' />" + + " </start-state>" + + " <state name='get old'>" + + " <timer name='pension' " + + " duedate='#{dateOfPension}' " + + " transition='time-out-transition' >" + + " <action class='the-remainder-action-class-name' />" + + " </timer>" + + " </state>" + + "</process-definition>"); JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService(); - + TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices() + .getSchedulerService(); + ProcessInstance processInstance = new ProcessInstance(processDefinition); - + Calendar dateOfPension = Calendar.getInstance(); dateOfPension.set(2036, 1, 12, 2, 10, 0); dateOfPension.clear(Calendar.MILLISECOND); processInstance.getContextInstance().setVariable("dateOfPension", dateOfPension.getTime()); - + processInstance.signal(); - + assertEquals(1, testSchedulerService.createdTimers.size()); Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0); assertEquals("pension", scheduledTimer.getName()); @@ -456,142 +470,148 @@ Calendar dateOfPensionTest = Calendar.getInstance(); dateOfPensionTest.clear(Calendar.MILLISECOND); dateOfPensionTest.set(2036, 1, 12, 2, 10, 0); - - assertEquals(dateOfPensionTest.getTime(), scheduledTimer.getDueDate()); + + assertEquals(dateOfPensionTest.getTime(), scheduledTimer.getDueDate()); assertNotNull(scheduledTimer.getDueDate()); - assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName()); + assertEquals("the-remainder-action-class-name", scheduledTimer.getAction() + .getActionDelegation() + .getClassName()); assertSame(processInstance.getRootToken(), scheduledTimer.getToken()); assertEquals("time-out-transition", scheduledTimer.getTransitionName()); - } finally { + } + finally { jbpmContext.close(); } } public void testTimerELPlusCreation() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='get old' />" + - " </start-state>" + - " <state name='get old'>" + - " <timer name='pension' " + - " duedate='#{dateOfBirth} + 65 years' " + - " transition='time-out-transition' >" + - " <action class='the-remainder-action-class-name' />" + - " </timer>" + - " </state>" + - "</process-definition>" - ); + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='get old' />" + + " </start-state>" + + " <state name='get old'>" + + " <timer name='pension' " + + " duedate='#{dateOfBirth} + 65 years' " + + " transition='time-out-transition' >" + + " <action class='the-remainder-action-class-name' />" + + " </timer>" + + " </state>" + + "</process-definition>"); JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService(); - + TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices() + .getSchedulerService(); + ProcessInstance processInstance = new ProcessInstance(processDefinition); - + Calendar dateOfBirth = Calendar.getInstance(); dateOfBirth.set(1971, 1, 12, 2, 10, 0); dateOfBirth.clear(Calendar.MILLISECOND); processInstance.getContextInstance().setVariable("dateOfBirth", dateOfBirth.getTime()); - + processInstance.signal(); - + assertEquals(1, testSchedulerService.createdTimers.size()); Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0); assertEquals("pension", scheduledTimer.getName()); assertEquals(processDefinition.getNode("get old"), scheduledTimer.getGraphElement()); assertNotNull(scheduledTimer.getDueDate()); - + Calendar dateOfPension = Calendar.getInstance(); dateOfPension.set(2036, 1, 12, 2, 10, 0); dateOfPension.clear(Calendar.MILLISECOND); - - assertEquals(dateOfPension.getTime(), scheduledTimer.getDueDate()); - assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName()); + + assertEquals(dateOfPension.getTime(), scheduledTimer.getDueDate()); + assertEquals("the-remainder-action-class-name", scheduledTimer.getAction() + .getActionDelegation() + .getClassName()); assertSame(processInstance.getRootToken(), scheduledTimer.getToken()); assertEquals("time-out-transition", scheduledTimer.getTransitionName()); - } finally { + } + finally { jbpmContext.close(); } } public void testTimerELMinusCreation() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='get old' />" + - " </start-state>" + - " <state name='get old'>" + - " <timer name='pensionReminder' " + - " duedate='#{dateOfPension} - 1 year' " + - " transition='time-out-transition' >" + - " <action class='the-remainder-action-class-name' />" + - " </timer>" + - " </state>" + - "</process-definition>" - ); + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='get old' />" + + " </start-state>" + + " <state name='get old'>" + + " <timer name='pensionReminder' " + + " duedate='#{dateOfPension} - 1 year' " + + " transition='time-out-transition' >" + + " <action class='the-remainder-action-class-name' />" + + " </timer>" + + " </state>" + + "</process-definition>"); JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService(); - + TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices() + .getSchedulerService(); + ProcessInstance processInstance = new ProcessInstance(processDefinition); - + Calendar dateOfPension = Calendar.getInstance(); dateOfPension.set(2036, 1, 12, 2, 10, 0); dateOfPension.clear(Calendar.MILLISECOND); processInstance.getContextInstance().setVariable("dateOfPension", dateOfPension.getTime()); - + processInstance.signal(); - + assertEquals(1, testSchedulerService.createdTimers.size()); Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0); assertEquals("pensionReminder", scheduledTimer.getName()); - assertEquals(processDefinition.getNode("get old"), scheduledTimer.getGraphElement()); + assertEquals(processDefinition.getNode("get old"), scheduledTimer.getGraphElement()); assertNotNull(scheduledTimer.getDueDate()); Calendar dateOfPensionReminder = Calendar.getInstance(); dateOfPensionReminder.set(2035, 1, 12, 2, 10, 0); dateOfPensionReminder.clear(Calendar.MILLISECOND); - assertEquals(dateOfPensionReminder.getTime(), scheduledTimer.getDueDate()); - assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName()); + assertEquals(dateOfPensionReminder.getTime(), scheduledTimer.getDueDate()); + assertEquals("the-remainder-action-class-name", scheduledTimer.getAction() + .getActionDelegation() + .getClassName()); assertSame(processInstance.getRootToken(), scheduledTimer.getToken()); assertEquals("time-out-transition", scheduledTimer.getTransitionName()); - } finally { + } + finally { jbpmContext.close(); } } public void testTimerELCalendarCreation() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='get old' />" + - " </start-state>" + - " <state name='get old'>" + - " <timer name='pension' " + - " duedate='#{dateOfPension}' " + - " transition='time-out-transition' >" + - " <action class='the-remainder-action-class-name' />" + - " </timer>" + - " </state>" + - "</process-definition>" - ); + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='get old' />" + + " </start-state>" + + " <state name='get old'>" + + " <timer name='pension' " + + " duedate='#{dateOfPension}' " + + " transition='time-out-transition' >" + + " <action class='the-remainder-action-class-name' />" + + " </timer>" + + " </state>" + + "</process-definition>"); JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService(); - + TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices() + .getSchedulerService(); + ProcessInstance processInstance = new ProcessInstance(processDefinition); - + Calendar dateOfPension = Calendar.getInstance(); dateOfPension.set(2036, 1, 12, 2, 10, 0); dateOfPension.clear(Calendar.MILLISECOND); processInstance.getContextInstance().setVariable("dateOfPension", dateOfPension); - + processInstance.signal(); - + assertEquals(1, testSchedulerService.createdTimers.size()); Timer scheduledTimer = (Timer) testSchedulerService.createdTimers.get(0); assertEquals("pension", scheduledTimer.getName()); @@ -600,98 +620,88 @@ Calendar dateOfPensionTest = Calendar.getInstance(); dateOfPensionTest.clear(Calendar.MILLISECOND); dateOfPensionTest.set(2036, 1, 12, 2, 10, 0); - - assertEquals(dateOfPensionTest.getTime(), scheduledTimer.getDueDate()); + + assertEquals(dateOfPensionTest.getTime(), scheduledTimer.getDueDate()); assertNotNull(scheduledTimer.getDueDate()); - assertEquals("the-remainder-action-class-name", scheduledTimer.getAction().getActionDelegation().getClassName()); + assertEquals("the-remainder-action-class-name", scheduledTimer.getAction() + .getActionDelegation() + .getClassName()); assertSame(processInstance.getRootToken(), scheduledTimer.getToken()); assertEquals("time-out-transition", scheduledTimer.getTransitionName()); - } finally { + } + finally { jbpmContext.close(); } } - + public void testTimerELUnsupportedFormatCreation() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='get old' />" + - " </start-state>" + - " <state name='get old'>" + - " <timer name='pension' " + - " duedate='#{dateOfPension}' " + - " transition='time-out-transition' >" + - " <action class='the-remainder-action-class-name' />" + - " </timer>" + - " </state>" + - "</process-definition>" - ); - + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='get old' />" + + " </start-state>" + + " <state name='get old'>" + + " <timer name='pension' " + + " duedate='#{dateOfPension}' " + + " transition='time-out-transition' >" + + " <action class='the-remainder-action-class-name' />" + + " </timer>" + + " </state>" + + "</process-definition>"); JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService(); - ProcessInstance processInstance = new ProcessInstance(processDefinition); - processInstance.getContextInstance().setVariable("dateOfPension", "Today"); - - try { - processInstance.signal(); - } catch (JbpmException je){ - assertEquals("Invalid basedate type: #{dateOfPension} is of type java.lang.String. Only Date and Calendar are supported", je.getMessage()); - } -//TODO Shouldn't signalling the process while not able to create a timer result in a rolback? -// processInstance.getContextInstance().setVariable("dateOfPension", "2036-02-12"); -// -// try { -// processInstance.signal(); -// } catch (JbpmException je){ -// assertEquals("Invalid basedate type: #{dateOfPension} is of type java.lang.String. Only Date and Calendar are supported", je.getMessage()); -// } - - } finally { + processInstance.signal(); + } + catch (JbpmException je) { + assertEquals("Invalid basedate type: #{dateOfPension} is of type java.lang.String. " + + "Only Date and Calendar are supported", je.getMessage()); + } + finally { jbpmContext.close(); } + + jbpmContext = jbpmConfiguration.createJbpmContext(); + try { + ProcessInstance processInstance = new ProcessInstance(processDefinition); + processInstance.getContextInstance().setVariable("dateOfPension", "2036-02-12"); + + processInstance.signal(); + } + catch (JbpmException je) { + assertEquals("Invalid basedate type: #{dateOfPension} is of type java.lang.String. " + + "Only Date and Calendar are supported", je.getMessage()); + } + finally { + jbpmContext.close(); + } } public void testTimerErrorCreation() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='get old' />" + - " </start-state>" + - " <state name='get old'>" + - " <timer name='pension' " + - " duedate='1 demo' " + - " transition='time-out-transition' >" + - " <action class='the-remainder-action-class-name' />" + - " </timer>" + - " </state>" + - "</process-definition>" - ); + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='get old' />" + + " </start-state>" + + " <state name='get old'>" + + " <timer name='pension' " + + " duedate='1 demo' " + + " transition='time-out-transition' >" + + " <action class='the-remainder-action-class-name' />" + + " </timer>" + + " </state>" + + "</process-definition>"); JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext(); try { - TestSchedulerService testSchedulerService = (TestSchedulerService) jbpmContext.getServices().getSchedulerService(); - ProcessInstance processInstance = new ProcessInstance(processDefinition); - - try { - processInstance.signal(); - } catch (JbpmException je){ - assertEquals("improper format of duration '1 demo'", je.getMessage()); - } - -//TODO Shouldn't signalling the process while not able to create a timer result in a rolback? -// try { -// processInstance.signal(); -// } catch (JbpmException je){ -// assertEquals("Invalid basedate type: #{dateOfPension} is of type java.lang.String. Only Date and Calendar are supported", je.getMessage()); -// } - - } finally { + processInstance.signal(); + } + catch (JbpmException je) { + assertEquals("improper format of duration '1 demo'", je.getMessage()); + } + finally { jbpmContext.close(); - } + } } } Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/src/main/java/org/jbpm/identity/hibernate/IdentitySession.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/identity/src/main/java/org/jbpm/identity/hibernate/IdentitySession.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/identity/src/main/java/org/jbpm/identity/hibernate/IdentitySession.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -75,14 +75,17 @@ // transaction convenience methods ////////////////////////////////////////// + /** @deprecated */ public Session getSession() { return session; } + /** @deprecated */ public Transaction getTransaction() { return transaction; } + /** @deprecated */ public void beginTransaction() { try { transaction = session.beginTransaction(); @@ -93,6 +96,7 @@ } } + /** @deprecated */ public void commitTransaction() { if (transaction == null) { throw new RuntimeException("can't commit : no transaction started"); @@ -108,6 +112,7 @@ transaction = null; } + /** @deprecated */ public void rollbackTransaction() { if (transaction == null) { throw new RuntimeException("can't rollback : no transaction started"); @@ -122,16 +127,19 @@ transaction = null; } + /** @deprecated */ public void commitTransactionAndClose() { commitTransaction(); close(); } + /** @deprecated */ public void rollbackTransactionAndClose() { rollbackTransaction(); close(); } + /** @deprecated */ public void close() { try { session.close(); @@ -144,10 +152,12 @@ // identity methods ///////////////////////////////////////////////////////// + /** @deprecated use {@link #saveEntity(Entity)} instead */ public void saveUser(User user) { session.save(user); } + /** @deprecated use {@link #saveEntity(Entity)} instead */ public void saveGroup(Group group) { session.save(group); } @@ -156,6 +166,7 @@ session.save(entity); } + /** @deprecated use {@link #saveEntity(Entity)} instead */ public void saveMembership(Membership membership) { session.save(membership); } @@ -168,14 +179,20 @@ return (Group) session.load(Group.class, new Long(groupId)); } + /** @deprecated use {@link #deleteEntity(Entity)} instead */ public void deleteGroup(Group group) { session.delete(group); } + /** @deprecated use {@link #deleteEntity(Entity)} instead */ public void deleteUser(User user) { session.delete(user); } + public void deleteEntity(Entity entity) { + session.delete(entity); + } + public User getUserByName(String userName) { List users = session.createCriteria(User.class).add(Restrictions.eq("name", userName)).list(); return users.isEmpty() ? null : (User) users.get(0); Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/IdentityDbTestCase.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/IdentityDbTestCase.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/IdentityDbTestCase.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -77,14 +77,14 @@ protected User saveAndReload(User user) { - identitySession.saveUser(user); + identitySession.saveEntity(user); newTransaction(); return identitySession.loadUser(user.getId()); } protected Group saveAndReload(Group group) { - identitySession.saveGroup(group); + identitySession.saveEntity(group); newTransaction(); return identitySession.loadGroup(group.getId()); } @@ -92,12 +92,12 @@ protected void deleteGroup(long groupId) { Group group = identitySession.loadGroup(groupId); - identitySession.deleteGroup(group); + identitySession.deleteEntity(group); } protected void deleteUser(long userId) { User user = identitySession.loadUser(userId); - identitySession.deleteUser(user); + identitySession.deleteEntity(user); } } Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/assignment/ExpressionAssignmentHandlerTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/assignment/ExpressionAssignmentHandlerTest.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/assignment/ExpressionAssignmentHandlerTest.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -71,11 +71,11 @@ membershipJohn = Membership.create(john, "leaderofthegang", hellsangels); membershipBill = Membership.create(bill, hellsangels); - identitySession.saveUser(john); - identitySession.saveUser(bill); - identitySession.saveGroup(hellsangels); - identitySession.saveMembership(membershipJohn); - identitySession.saveMembership(membershipBill); + identitySession.saveEntity(john); + identitySession.saveEntity(bill); + identitySession.saveEntity(hellsangels); + identitySession.saveEntity(membershipJohn); + identitySession.saveEntity(membershipBill); } private void setUpProcessInstance() { Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/hibernate/GroupDbTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/hibernate/GroupDbTest.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/identity/src/test/java/org/jbpm/identity/hibernate/GroupDbTest.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -82,7 +82,7 @@ public void testGroups() { Group clowns = new Group("clowns"); - identitySession.saveGroup(clowns); + identitySession.saveEntity(clowns); newTransaction(); @@ -97,7 +97,7 @@ Group clowns = new Group("clowns"); clowns.addChild(new Group("cowboys")); clowns.addChild(new Group("indians")); - identitySession.saveGroup(clowns); + identitySession.saveEntity(clowns); newTransaction(); Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/EmptyAction.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/EmptyAction.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/EmptyAction.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -10,6 +10,8 @@ */ public class EmptyAction implements ActionHandler { + private static final long serialVersionUID = 1L; + public void execute(ExecutionContext executionContext) throws Exception { } Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartTaskAndPlanCompletion.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartTaskAndPlanCompletion.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartTaskAndPlanCompletion.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,7 +1,5 @@ package org.jbpm.sim.action; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jbpm.graph.def.Action; import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.sim.entity.TaskInstanceEntity; @@ -19,7 +17,6 @@ public class StartTaskAndPlanCompletion extends Action { private static final long serialVersionUID = 1L; - private static Log log = LogFactory.getLog(StartTaskAndPlanCompletion.class); public void execute(ExecutionContext executionContext) throws Exception { SimulationInstance simulationInstance = (SimulationInstance)executionContext.getProcessInstance().getInstance(SimulationInstance.class); Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartWorkOnStateAndPlanCompletion.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartWorkOnStateAndPlanCompletion.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/action/StartWorkOnStateAndPlanCompletion.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,15 +1,11 @@ package org.jbpm.sim.action; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jbpm.graph.def.Action; import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.graph.exe.Token; import org.jbpm.graph.node.State; -import org.jbpm.sim.entity.TaskInstanceEntity; import org.jbpm.sim.entity.TokenEntity; import org.jbpm.sim.jpdl.SimulationInstance; -import org.jbpm.taskmgmt.exe.TaskInstance; /** * The StartTaskAndPlanCompletion Action is added by the simulation to all Nodes @@ -23,7 +19,6 @@ public class StartWorkOnStateAndPlanCompletion extends Action { private static final long serialVersionUID = 1L; - private static Log log = LogFactory.getLog(StartWorkOnStateAndPlanCompletion.class); public void execute(ExecutionContext executionContext) throws Exception { // applies only on states! Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/GetSimulationInputCommand.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/GetSimulationInputCommand.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/bam/GetSimulationInputCommand.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -34,7 +34,9 @@ * @author bernd.ruecker(a)camunda.com */ public class GetSimulationInputCommand extends GetProcessDefinitionCommand { - + + private static final long serialVersionUID = 1L; + /** * if set, only information <b>later</b> than the given time * of day is used. Only the time part is used! @@ -229,7 +231,7 @@ cmd.setFromTimeOfDay(cal1.getTime()); cmd.setTillTimeOfDay(cal2.getTime()); BamSimulationProposal result = (BamSimulationProposal) cmd.execute(ctx); - result.print(result); + BamSimulationProposal.print(result); } public Date getFromTimeOfDay() { Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/HistorialProcessVariableSource.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/HistorialProcessVariableSource.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/HistorialProcessVariableSource.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -26,19 +26,23 @@ } public void reset() { - throw new RuntimeException("not yet implemented"); + throw new UnsupportedOperationException("not yet implemented"); } + public CommandService getCommandService() { + return commandService; + } + public void setCommandService(CommandService commandService) { this.commandService = commandService; } public boolean hasNext() { - throw new RuntimeException("not yet implemented"); + throw new UnsupportedOperationException("not yet implemented"); } public void addNextData(ExecutionContext ctx) { - throw new RuntimeException("not yet implemented"); + throw new UnsupportedOperationException("not yet implemented"); } } Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataFilterAction.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataFilterAction.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataFilterAction.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,10 +1,8 @@ package org.jbpm.sim.datasource; import org.jbpm.graph.def.Action; -import org.jbpm.graph.def.ActionHandler; import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.sim.jpdl.SimulationDefinition; -import org.jbpm.sim.jpdl.SimulationInstance; /** * This action can be added to processes at all places where business @@ -17,6 +15,8 @@ private String name; + private static final long serialVersionUID = 1L; + public String getName() { return name; } Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataSourceAction.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataSourceAction.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/datasource/UseDataSourceAction.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,7 +1,6 @@ package org.jbpm.sim.datasource; import org.jbpm.graph.def.Action; -import org.jbpm.graph.def.ActionHandler; import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.sim.jpdl.SimulationDefinition; import org.jbpm.sim.jpdl.SimulationInstance; @@ -17,6 +16,8 @@ private String name; + private static final long serialVersionUID = 1L; + public void execute(ExecutionContext executionContext) throws Exception { SimulationDefinition simDef = (SimulationDefinition)executionContext.getDefinition(SimulationDefinition.class); ProcessDataSource dataSource = simDef.getDataSource( name ); Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/DefaultJbpmSimulationModel.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/DefaultJbpmSimulationModel.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/DefaultJbpmSimulationModel.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -3,29 +3,23 @@ import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.sim.jpdl.SimulationJpdlXmlReader; -import desmoj.core.simulator.Model; - public class DefaultJbpmSimulationModel extends JbpmSimulationModel { private ProcessDefinition[] processDefinitions; public DefaultJbpmSimulationModel(String processXml) { - super(); readFromXml( new String[] { processXml } ); } public DefaultJbpmSimulationModel(String[] processXml) { - super(); readFromXml( processXml ); } public DefaultJbpmSimulationModel(ProcessDefinition processDefinition) { - super(); this.processDefinitions = new ProcessDefinition[] {processDefinition}; } public DefaultJbpmSimulationModel(ProcessDefinition[] processDefinitions) { - super(); this.processDefinitions = processDefinitions; } Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationClock.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationClock.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationClock.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -8,7 +8,6 @@ import org.apache.commons.logging.LogFactory; import org.jbpm.util.Clock; -import desmoj.core.simulator.SimClock; import desmoj.core.simulator.SimTime; /** @@ -44,7 +43,6 @@ } public void update(Observable o, Object arg) { - SimClock clock = (SimClock) o; SimTime currentSimTime = (SimTime) arg; long converterValue = getAsLong(currentSimTime.getTimeValue()); Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationScenario.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationScenario.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationScenario.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -2,14 +2,12 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Enumeration; import java.util.Iterator; import java.util.List; import org.jbpm.JbpmContext; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; -import org.jbpm.module.def.ModuleDefinition; import org.jbpm.sim.datasource.ProcessDataFilter; import org.jbpm.sim.datasource.ProcessDataSource; import org.jbpm.sim.event.StatisticsResetEvent; Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/entity/ResourceUsingEntity.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/entity/ResourceUsingEntity.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/entity/ResourceUsingEntity.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -164,7 +164,6 @@ */ public void releaseResources() { // release all resources - ResourceEntity[] e = null; for (Iterator iterator = acquiredResourceEntities.keySet().iterator(); iterator.hasNext();) { String poolName = (String) iterator.next(); ResourceEntity[] resourceEntities = (ResourceEntity[]) acquiredResourceEntities.get(poolName); Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/ProcessStartEventGenerator.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/ProcessStartEventGenerator.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/ProcessStartEventGenerator.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,7 +1,5 @@ package org.jbpm.sim.event; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; import org.jbpm.sim.def.JbpmSimulationModel; @@ -13,8 +11,6 @@ public class ProcessStartEventGenerator extends ExternalEvent { - private static Log log = LogFactory.getLog(ProcessStartEventGenerator.class); - private JbpmSimulationModel model; private ProcessDefinition processDefinition; Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/StatisticsResetEvent.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/StatisticsResetEvent.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/event/StatisticsResetEvent.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,7 +1,5 @@ package org.jbpm.sim.event; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.jbpm.sim.def.JbpmSimulationModel; import desmoj.core.simulator.ExternalEvent; @@ -15,8 +13,6 @@ */ public class StatisticsResetEvent extends ExternalEvent { - private static Log log = LogFactory.getLog(StatisticsResetEvent.class); - private JbpmSimulationModel model; public StatisticsResetEvent(Model owner) { Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/JbpmSimulationExperimentRunner.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/JbpmSimulationExperimentRunner.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/JbpmSimulationExperimentRunner.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -26,12 +26,10 @@ */ private boolean async = true; - private boolean createDesmojHtmlOutput = false; + private boolean createDesmojHtmlOutput; - private boolean rememberEndedProcessInstances = false; + private boolean rememberEndedProcessInstances; - private SimulationProgressListener progressListener = null; - public JbpmSimulationExperimentRunner() { } @@ -39,7 +37,6 @@ SimulationProgressListener progressListener) { this.showReport = showReport; this.async = async; - this.progressListener = progressListener; } /** @@ -90,24 +87,15 @@ ScenarioComparisionReport r = new ScenarioComparisionReport(report); r.show(); } - // else: no reults -> show no report + // else: no results -> show no report } public static void main() { - String experimentConf = "/xyz/conf.xml"; boolean showReport = true; boolean runAsync = true; - SimulationProgressListener listener = new org.jbpm.sim.exe.SimulationProgressListener () { - public void newScenario(String scenarioName, int scenarioNumber, int scenarioCount) { - } - public void experimentFinished() { - } - public void progressChanged(double currentScenarioPercentage) { - } - }; - new org.jbpm.sim.exe.JbpmSimulationExperimentRunner(showReport, runAsync, listener).run(experimentConf); - + + new org.jbpm.sim.exe.JbpmSimulationExperimentRunner(showReport, runAsync, null).run(experimentConf); } public void setCreateDesmojHtmlOutput(boolean createDesmojHtmlOutput) { Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimAction.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimAction.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimAction.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -73,6 +73,8 @@ private class ActionHandlerDelegation extends Action { private SimulationHandler delegate; + + private static final long serialVersionUID = 1L; public ActionHandlerDelegation(SimulationHandler delegate) { this.delegate = delegate; Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimState.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimState.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimState.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,7 +1,5 @@ package org.jbpm.sim.jpdl; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.dom4j.Element; import org.jbpm.graph.def.Event; import org.jbpm.graph.node.State; @@ -11,7 +9,6 @@ public class SimState extends State { private static final long serialVersionUID = 1L; - private static Log log = LogFactory.getLog(SimState.class); public void read(Element nodeElement, JpdlXmlReader jpdlXmlReader) { super.read(nodeElement, jpdlXmlReader); Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimTaskNode.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimTaskNode.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimTaskNode.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -6,6 +6,8 @@ public class SimTaskNode extends TaskNode { + private static final long serialVersionUID = 1L; + public void read(Element element, JpdlXmlReader jpdlReader) { super.read(element, jpdlReader); } Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimulationJpdlXmlReader.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimulationJpdlXmlReader.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/jpdl/SimulationJpdlXmlReader.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -4,9 +4,9 @@ import java.io.StringReader; import java.util.Iterator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.dom4j.Element; +import org.xml.sax.InputSource; + import org.jbpm.JbpmConfiguration; import org.jbpm.JbpmContext; import org.jbpm.graph.def.Event; @@ -25,7 +25,6 @@ import org.jbpm.sim.exe.ExperimentReader; import org.jbpm.taskmgmt.def.Task; import org.jbpm.taskmgmt.def.TaskMgmtDefinition; -import org.xml.sax.InputSource; /** * The SimulationJpdXmlReader is used instead of the original @@ -40,8 +39,6 @@ private static final long serialVersionUID = 1L; - private static Log log = LogFactory.getLog(SimulationJpdlXmlReader.class); - public SimulationJpdlXmlReader(String processXml) { this(new InputSource(new StringReader(processXml))); } Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/kpi/BusinessFigureAction.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/kpi/BusinessFigureAction.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/kpi/BusinessFigureAction.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,7 +1,6 @@ package org.jbpm.sim.kpi; import org.jbpm.graph.def.Action; -import org.jbpm.graph.def.ActionHandler; import org.jbpm.graph.exe.ExecutionContext; import org.jbpm.sim.def.JbpmSimulationModel; import org.jbpm.sim.jpdl.SimulationInstance; @@ -17,6 +16,8 @@ private String name; + private static final long serialVersionUID = 1L; + public void execute(ExecutionContext executionContext) throws Exception { SimulationInstance simulationInstance = (SimulationInstance)executionContext.getProcessInstance().getInstance(SimulationInstance.class); JbpmSimulationModel simModel = simulationInstance.getSimulationModel(); Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/InMemoryOutput.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/InMemoryOutput.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/InMemoryOutput.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -14,11 +14,9 @@ import desmoj.core.dist.Distribution; import desmoj.core.report.Message; import desmoj.core.report.MessageReceiver; -import desmoj.core.report.OutputType; import desmoj.core.report.Reporter; import desmoj.core.simulator.Experiment; import desmoj.core.simulator.Model; -import desmoj.core.simulator.Queue; import desmoj.core.simulator.QueueBased; import desmoj.core.simulator.Reportable; import desmoj.core.statistic.Count; @@ -73,7 +71,7 @@ JbpmSimulationModel jbpmModel = (JbpmSimulationModel) source.getModel(); String name = jbpmModel.getShortNameFor(source.getName()); - if (Model.class.isAssignableFrom(source.getClass())) { + if (source instanceof Model) { Model model = (Model)source; report.setScenarioName( scenarioName ); @@ -105,7 +103,7 @@ report.addBusinessFigure(type, sum); } } - else if (ValueStatistics.class.isAssignableFrom(source.getClass())) { + else if (source instanceof ValueStatistics) { ValueStatistics vs = (ValueStatistics)source; if (vs.getName().startsWith(SimulationConstants.NAME_PREFIX_WAITING_BEFORE_STATE) && vs.getName().endsWith(SimulationConstants.NAME_SUFFIX_WAITING_FOR_RESOURCE)) @@ -115,7 +113,7 @@ else report.addMiscValueStatistics(new ValueStatisticResult(name, scenarioName, vs)); } - else if (QueueBased.class.isAssignableFrom(source.getClass())) { + else if (source instanceof QueueBased) { QueueBased queue = (QueueBased)source; if (queue.getName().startsWith(SimulationConstants.NAME_PREFIX_RESOURCE_QUEUE) && queue.getName().endsWith(SimulationConstants.NAME_SUFFIX_RESOURCE_QUEUE)) @@ -125,7 +123,7 @@ else report.addMiscQueueStatistics(new QueueStatisticsResult(name, scenarioName, queue)); } - else if (Count.class.isAssignableFrom(source.getClass())) { + else if (source instanceof Count) { Count count = (Count)source; // we have counts for process starts and ends @@ -134,11 +132,11 @@ else if (count.getName().startsWith(SimulationConstants.NAME_PREFIX_PROCESS_START) && count.getName().endsWith(SimulationConstants.NAME_SUFFIX_PROCESS_START)) report.addProcessStartCount(new CountResult(name, scenarioName, count)); } - else if (Distribution.class.isAssignableFrom(source.getClass())) { - Distribution dist = (Distribution)source; + else if (source instanceof Distribution) { + // Distribution dist = (Distribution)source; // TODO: Think about what to do here... - // Maybe also interessting to query the original DistributionDefinition again here + // Maybe also interesting to query the original DistributionDefinition again here // dist.getInitialSeed(); // dist.getName(); Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/CountResult.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/CountResult.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/CountResult.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -6,6 +6,8 @@ private long count; + private static final long serialVersionUID = 1L; + public CountResult(String name, String scenario, Count count) { super(name, scenario); this.count = count.getValue(); Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/QueueStatisticsResult.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/QueueStatisticsResult.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/QueueStatisticsResult.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -3,7 +3,6 @@ import desmoj.core.simulator.Queue; import desmoj.core.simulator.QueueBased; -import desmoj.core.simulator.SimTime; /** * POJO to remember values from objects of type Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/TimeSeriesResult.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/TimeSeriesResult.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/TimeSeriesResult.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,9 +1,7 @@ package org.jbpm.sim.report.dto; import java.util.Collection; -import java.util.Iterator; - import desmoj.core.statistic.TimeSeries; public class TimeSeriesResult extends BaseResult { // org.jbpm.sim.report.dto.TimeSeriesResult @@ -29,8 +27,6 @@ public TimeSeriesResult(String name, String scenario, Collection timeValue, Collection dataValue) { super(name, scenario); - double[] timeValuesTemp = null; - double[] dataValueTemp = null; // I miss my autoboxing here :-( if (timeValue!=null && dataValue!=null) { Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/UtilizationStatisticsResult.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/UtilizationStatisticsResult.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/dto/UtilizationStatisticsResult.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,9 +1,6 @@ package org.jbpm.sim.report.dto; - -import desmoj.core.simulator.Queue; import desmoj.core.simulator.QueueBased; -import desmoj.core.simulator.SimTime; /** * POJO to remember Utilization of resource pools Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioComparisionReport.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioComparisionReport.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioComparisionReport.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,7 +1,6 @@ package org.jbpm.sim.report.jasper; import java.util.HashMap; -import java.util.List; import java.util.Map; import org.jbpm.sim.def.JbpmSimulationExperiment; Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioDetailsReport.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioDetailsReport.java 2009-08-08 08:47:32 UTC (rev 5449) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/report/jasper/ScenarioDetailsReport.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,16 +1,12 @@ package org.jbpm.sim.report.jasper; import java.util.HashMap; -import java.util.List; import java.util.Map; import org.jbpm.sim.def.JbpmSimulationExperiment; import org.jbpm.sim.exe.ExperimentReader; import org.jbpm.sim.report.ScenarioReport; -import net.sf.jasperreports.engine.data.JRBeanArrayDataSource; -import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; - /** * Report to show details of the simulation results of one scenario * Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/CoreLibrary.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/CoreLibrary.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/CoreLibrary.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -111,7 +111,7 @@ addComponent("taskForm", UITaskForm.COMPONENT_TYPE, UITaskForm.RENDERER_TYPE, TaskFormHandler.class); try { - addFunction("getServerTimeZone", TimeZone.class.getMethod("getDefault", null)); + addFunction("getServerTimeZone", TimeZone.class.getMethod("getDefault")); } catch (NoSuchMethodException e) { throw new AssertionError(e); } Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/GetVariableMapActionListener.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/GetVariableMapActionListener.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/GetVariableMapActionListener.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -13,11 +13,7 @@ import javax.el.ELContext; import java.util.Map; -import java.util.Collections; -/** - * - */ public final class GetVariableMapActionListener implements JbpmActionListener { private final ValueExpression valueExpression; private final ValueExpression targetExpression; Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/LazyJbpmActionListener.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/LazyJbpmActionListener.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/LazyJbpmActionListener.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -35,9 +35,9 @@ context.setError("Error calling action listener", "The type value is null"); return; } - final Class type; - if (typeValue instanceof Class) { - type = (Class) typeValue; + final Class<?> type; + if (typeValue instanceof Class<?>) { + type = (Class<?>) typeValue; } else { final String className = typeValue.toString(); try { Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListProcessInstancesActionListener.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListProcessInstancesActionListener.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListProcessInstancesActionListener.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -2,7 +2,6 @@ import org.jbpm.jsf.JbpmActionListener; import org.jbpm.jsf.JbpmJsfContext; -import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ProcessInstance; import javax.el.ValueExpression; @@ -12,9 +11,6 @@ import java.util.List; -/** - * - */ public final class ListProcessInstancesActionListener implements JbpmActionListener { private final ValueExpression targetExpression; private final ValueExpression processIdExpression; Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessActionListener.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessActionListener.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessActionListener.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -2,7 +2,6 @@ import org.jbpm.jsf.JbpmActionListener; import org.jbpm.jsf.JbpmJsfContext; -import org.jbpm.graph.exe.ProcessInstance; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.taskmgmt.exe.TaskInstance; @@ -13,11 +12,7 @@ import java.util.List; import java.util.Collections; -import java.util.ArrayList; -/** - * - */ public final class ListTasksForProcessActionListener implements JbpmActionListener { private final ValueExpression targetExpression; private final ValueExpression processExpression; Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessInstanceActionListener.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessInstanceActionListener.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTasksForProcessInstanceActionListener.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -13,9 +13,6 @@ import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; -/** - * - */ public final class ListTasksForProcessInstanceActionListener implements JbpmActionListener { private final ValueExpression targetExpression; private final ValueExpression processInstanceExpression; @@ -29,7 +26,6 @@ return "listTasksForProcessInstance"; } - @SuppressWarnings ({"unchecked"}) public void handleAction(JbpmJsfContext context, ActionEvent event) { try { final FacesContext facesContext = FacesContext.getCurrentInstance(); Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTokensActionListener.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTokensActionListener.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/ListTokensActionListener.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -9,9 +9,6 @@ import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; -/** - * - */ public final class ListTokensActionListener implements JbpmActionListener { private final ValueExpression targetExpression; private final ValueExpression processInstanceExpression; @@ -25,7 +22,6 @@ return "listTokens"; } - @SuppressWarnings ({"unchecked"}) public void handleAction(JbpmJsfContext context, ActionEvent event) { try { final FacesContext facesContext = FacesContext.getCurrentInstance(); Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/StartProcessActionListener.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/StartProcessActionListener.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/action/StartProcessActionListener.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,14 +1,9 @@ package org.jbpm.jsf.core.action; -import org.jbpm.graph.def.Node; import org.jbpm.graph.def.ProcessDefinition; -import org.jbpm.graph.def.Transition; import org.jbpm.graph.exe.ProcessInstance; -import org.jbpm.graph.exe.Token; import org.jbpm.jsf.JbpmActionListener; import org.jbpm.jsf.JbpmJsfContext; -import org.jbpm.taskmgmt.exe.TaskInstance; -import org.jbpm.taskmgmt.exe.TaskMgmtInstance; import javax.el.ELContext; import javax.el.ELException; @@ -16,9 +11,6 @@ import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; -/** - * - */ public final class StartProcessActionListener implements JbpmActionListener { private final ValueExpression processExpression; @@ -56,15 +48,15 @@ // signal the token along the default transition. context.addSuccessMessage("Started process"); - final TaskMgmtInstance taskMgmtInstance = instance.getTaskMgmtInstance(); - final TaskInstance startTaskInstance = taskMgmtInstance.createStartTaskInstance(); - /* next piece causes NPE. * and i don't think it is needed to signal a new process automatically. that can * be done in the console itself as well. * TODO it would be nice if the console automatically navigated to the screen where * you can see the root token and actually give the signal + final TaskMgmtInstance taskMgmtInstance = instance.getTaskMgmtInstance(); + final TaskInstance startTaskInstance = taskMgmtInstance.createStartTaskInstance(); + if (startTaskInstance == null) { // There is no start task final Node initialNode = definition.getStartState(); Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/AbstractHandler.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/AbstractHandler.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/AbstractHandler.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -42,15 +42,12 @@ public abstract class AbstractHandler extends TagHandler { public static final String JBPM_JSF_CONTEXT_KEY = "org.jbpm.jsf.CONTEXT"; - private final TagConfig config; - private final TagAttribute unlessAttribute; private final TagAttribute navigateAttribute; private final TagAttribute nameAttribute; public AbstractHandler(final TagConfig config) { super(config); - this.config = config; unlessAttribute = getAttribute("unless"); navigateAttribute = getAttribute("navigate"); nameAttribute = getAttribute("name"); Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/CancelHandler.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/CancelHandler.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/CancelHandler.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -2,7 +2,6 @@ import org.jboss.gravel.common.annotation.TldTag; import org.jboss.gravel.common.annotation.TldAttribute; -import org.jbpm.taskmgmt.exe.TaskInstance; import org.jbpm.jsf.JbpmActionListener; import org.jbpm.jsf.core.action.CancelActionListener; Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/GetVariableHandler.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/GetVariableHandler.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/GetVariableHandler.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -4,7 +4,6 @@ import org.jboss.gravel.common.annotation.TldTag; import org.jbpm.jsf.JbpmActionListener; import org.jbpm.jsf.core.action.GetVariableActionListener; -import org.jbpm.taskmgmt.exe.TaskInstance; import com.sun.facelets.FaceletContext; import com.sun.facelets.tag.TagAttribute; Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/ListProcessInstancesHandler.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/ListProcessInstancesHandler.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/ListProcessInstancesHandler.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -3,7 +3,6 @@ import org.jboss.gravel.common.annotation.TldTag; import org.jboss.gravel.common.annotation.TldAttribute; import org.jbpm.jsf.JbpmActionListener; -import org.jbpm.jsf.core.action.ListProcessesActionListener; import org.jbpm.jsf.core.action.ListProcessInstancesActionListener; import java.util.List; @@ -11,9 +10,6 @@ import com.sun.facelets.tag.TagConfig; import com.sun.facelets.FaceletContext; -/** - * - */ @TldTag ( name = "listProcessInstances", description = "Read a list of process instances from a process definition.", Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/RemoveVariableHandler.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/RemoveVariableHandler.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/RemoveVariableHandler.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -4,15 +4,11 @@ import org.jboss.gravel.common.annotation.TldTag; import org.jbpm.jsf.JbpmActionListener; import org.jbpm.jsf.core.action.RemoveVariableActionListener; -import org.jbpm.taskmgmt.exe.TaskInstance; import com.sun.facelets.FaceletContext; import com.sun.facelets.tag.TagAttribute; import com.sun.facelets.tag.TagConfig; -/** - * - */ @TldTag( name = "removeVariable", description = "Remove a process variable. Optionally store the old value into an EL expression.", Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/SignalHandler.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/SignalHandler.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/SignalHandler.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -2,7 +2,6 @@ import org.jboss.gravel.common.annotation.TldAttribute; import org.jboss.gravel.common.annotation.TldTag; -import org.jbpm.graph.exe.Token; import org.jbpm.jsf.JbpmActionListener; import org.jbpm.jsf.core.action.SignalActionListener; @@ -10,9 +9,6 @@ import com.sun.facelets.tag.TagAttribute; import com.sun.facelets.tag.TagConfig; -/** - * - */ @TldTag ( name = "signal", description = "Signal a token or process instance. Optionally specify the transition.", Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/UpdateVariableHandler.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/UpdateVariableHandler.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/handler/UpdateVariableHandler.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -4,15 +4,11 @@ import org.jboss.gravel.common.annotation.TldTag; import org.jbpm.jsf.JbpmActionListener; import org.jbpm.jsf.core.action.UpdateVariableActionListener; -import org.jbpm.taskmgmt.exe.TaskInstance; import com.sun.facelets.FaceletContext; import com.sun.facelets.tag.TagAttribute; import com.sun.facelets.tag.TagConfig; -/** - * - */ @TldTag ( name = "updateVariable", description = "Update a process variable. Optionally store the old value into an EL expression.", Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/phase/JbpmPhaseListener.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/phase/JbpmPhaseListener.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/core/phase/JbpmPhaseListener.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,10 +1,8 @@ package org.jbpm.jsf.core.phase; import java.util.Map; -import org.jbpm.JbpmContext; import org.jbpm.jsf.core.handler.AbstractHandler; import org.jbpm.jsf.core.impl.JbpmJsfContextImpl; -import org.jbpm.persistence.db.DbPersistenceService; import javax.faces.application.FacesMessage; import javax.faces.application.NavigationHandler; @@ -16,9 +14,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -/** - * - */ public final class JbpmPhaseListener implements PhaseListener { private static final long serialVersionUID = 1L; @@ -107,15 +102,5 @@ } } - private void startNewTxn(final JbpmJsfContextImpl jbpmJsfContext) { - if (jbpmJsfContext.hasJbpmContext()) { - final JbpmContext jbpmContext = jbpmJsfContext.getJbpmContext(); - DbPersistenceService dbPersistenceService = (DbPersistenceService) jbpmContext.getServices().getPersistenceService(); - log.fine("Committing transaction"); - dbPersistenceService.endTransaction(); - dbPersistenceService.beginTransaction(); - } - } - private static final Logger log = Logger.getLogger("org.jbpm.jsf.core.phase.JbpmPhaseListener"); } Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataArea.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataArea.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataArea.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -1,14 +1,13 @@ package org.jbpm.jsf.taskformlayout.ui; -/** - * - */ public final class UIDataArea extends UIDataSection { public static final String COMPONENT_TYPE = "jbpm4jsf.tfl.DataArea"; public static final String COMPONENT_FAMILY = "jbpm4jsf.tfl"; public static final String RENDERER_TYPE = null; + private static final long serialVersionUID = 1L; + public UIDataArea() { setRendererType(RENDERER_TYPE); } Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataCell.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataCell.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataCell.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -6,15 +6,14 @@ import java.io.Serializable; -/** - * - */ public final class UIDataCell extends UIGravelBase { public static final String COMPONENT_TYPE = "jbpm4jsf.tfl.DataCell"; public static final String COMPONENT_FAMILY = "jbpm4jsf.tfl"; public static final String RENDERER_TYPE = null; + private static final long serialVersionUID = 1L; + public UIDataCell() { setRendererType(RENDERER_TYPE); } Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataForm.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataForm.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataForm.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -5,15 +5,14 @@ import javax.faces.context.FacesContext; -/** - * - */ public final class UIDataForm extends UIGravelBase { public static final String COMPONENT_TYPE = "jbpm4jsf.tfl.DataForm"; public static final String COMPONENT_FAMILY = "jbpm4jsf.tfl"; public static final String RENDERER_TYPE = "jbpm4jsf.tlf.DataForm"; + private static final long serialVersionUID = 1L; + public UIDataForm() { setRendererType(RENDERER_TYPE); } Modified: projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataSection.java =================================================================== --- projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataSection.java 2009-08-08 08:47:32 UTC (rev 5449) +++ projects/jsf-console/branches/jsf-console-3.2-soa/jbpm4jsf/src/main/java/org/jbpm/jsf/taskformlayout/ui/UIDataSection.java 2009-08-08 09:24:45 UTC (rev 5450) @@ -6,15 +6,14 @@ import java.io.Serializable; -/** - * - */ public class UIDataSection extends UIGravelBase { public static final String COMPONENT_TYPE = "jbpm4jsf.tfl.DataSection"; public static final String COMPONENT_FAMILY = "jbpm4jsf.tfl"; public static final String RENDERER_TYPE = null; + private static final long serialVersionUID = 1L; + public UIDataSection() { setRendererType(RENDERER_TYPE); }