[jbpm-commits] JBoss JBPM SVN: r4918 - in jbpm4/branches/tbaeyens/modules/pvm/src/main: java/org/jbpm/pvm/internal/model and 2 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-05-27 14:46:01 -0400 (Wed, 27 May 2009) New Revision: 4918 Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml Log: refactored signal job Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java 2009-05-27 16:43:05 UTC (rev 4917) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java 2009-05-27 18:46:01 UTC (rev 4918) @@ -52,6 +52,7 @@ JobDbSession jobDbSession = environment.get(JobDbSession.class); jobDbSession.delete(this); + return null; } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-05-27 16:43:05 UTC (rev 4917) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-05-27 18:46:01 UTC (rev 4918) @@ -379,7 +379,7 @@ checkActive(); propagation = Propagation.EXPLICIT; if (getActivity()!=null) { - performAtomicOperation(new Signal(signal, parameters, getActivity())); + performAtomicOperation(new Signal(signal, parameters)); } else if (transition!=null) { performAtomicOperation(AtomicOperation.TRANSITION_START_ACTIVITY); } else { Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java 2009-05-27 16:43:05 UTC (rev 4917) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/MoveToParentActivity.java 2009-05-27 18:46:01 UTC (rev 4918) @@ -36,7 +36,7 @@ ExecutionImpl propagatingExecution = execution.endActivity(activity); propagatingExecution.setActivity(parentActivity); - propagatingExecution.performAtomicOperation(new Signal(null, null, parentActivity)); + propagatingExecution.performAtomicOperation(new Signal(null, null)); } public MessageImpl<?> createAsyncMessage(ExecutionImpl execution) { Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2009-05-27 16:43:05 UTC (rev 4917) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/Signal.java 2009-05-27 18:46:01 UTC (rev 4918) @@ -40,12 +40,10 @@ String signalName; Map<String, ?> parameters; - ActivityImpl activity; - public Signal(String signalName, Map<String, ?> parameters, ActivityImpl activity) { + public Signal(String signalName, Map<String, ?> parameters) { this.signalName = signalName; this.parameters = parameters; - this.activity = activity; } public boolean isAsync(ExecutionImpl execution) { @@ -53,6 +51,8 @@ } public void perform(ExecutionImpl execution) { + ActivityImpl activity = execution.getActivity(); + if (execution.getName()!=null) { log.debug(execution.toString()+" signals "+activity); } else { @@ -82,6 +82,6 @@ } public MessageImpl<?> createAsyncMessage(ExecutionImpl execution) { - return new SignalMessage(execution, signalName, activity); + return null; } } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java 2009-05-27 16:43:05 UTC (rev 4917) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/op/SignalMessage.java 2009-05-27 18:46:01 UTC (rev 4918) @@ -21,12 +21,14 @@ */ package org.jbpm.pvm.internal.model.op; +import java.util.Map; + import org.jbpm.api.Execution; import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.job.MessageImpl; import org.jbpm.pvm.internal.jobexecutor.JobDbSession; +import org.jbpm.pvm.internal.model.ActivityImpl; import org.jbpm.pvm.internal.model.ExecutionImpl; -import org.jbpm.pvm.internal.model.ActivityImpl; /** * @author Tom Baeyens @@ -36,21 +38,21 @@ private static final long serialVersionUID = 1L; String signalName; - ActivityImpl activity; + Map<String, ?> parameters; public SignalMessage() { } - public SignalMessage(ExecutionImpl execution, String signalName, ActivityImpl activity) { + public SignalMessage(ExecutionImpl execution, String signalName, Map<String, ?> parameters) { super(execution); this.signalName = signalName; - this.activity = activity; + this.parameters = parameters; } public Object execute(Environment environment) throws Exception { execution.setState(Execution.STATE_ACTIVE_ROOT); - Signal signal = new Signal(signalName, null, activity); + Signal signal = new Signal(signalName, parameters); execution.performAtomicOperationSync(signal); JobDbSession jobDbSession = environment.get(JobDbSession.class); Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml 2009-05-27 16:43:05 UTC (rev 4917) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml 2009-05-27 18:46:01 UTC (rev 4918) @@ -232,11 +232,7 @@ <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeAct" /> <subclass name="org.jbpm.pvm.internal.model.op.ExecuteEventListenerMessage" discriminator-value="ExeEvtLsnr" /> - <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="Signal"> - <property name="signalName" column="SIGNAL_" /> - </subclass> <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="Cmd" /> - </subclass> <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer">