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

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Aug 5 12:42:37 EDT 2008


Author: tom.baeyens at jboss.com
Date: 2008-08-05 12:42:37 -0400 (Tue, 05 Aug 2008)
New Revision: 1825

Added:
   jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java
Modified:
   jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java
   jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java
   jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java
   jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
   jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/test/base/EnvironmentDbTestCase.java
Log:
updated job executor test to new test suite base classes

Added: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java	                        (rev 0)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/job/CommandMessage.java	2008-08-05 16:42:37 UTC (rev 1825)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.job;
+
+import org.jbpm.pvm.env.Environment;
+import org.jbpm.pvm.internal.cmd.Command;
+import org.jbpm.pvm.internal.wire.Descriptor;
+import org.jbpm.pvm.internal.wire.WireContext;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class CommandMessage extends MessageImpl<Object> {
+
+  private static final long serialVersionUID = 1L;
+  
+  public CommandMessage() {
+  }
+
+  public CommandMessage(Descriptor commandDescriptor) {
+    this.commandDescriptor = commandDescriptor;
+  }
+
+  public Object execute(Environment environment) throws Exception {
+    Command<Object> command = (Command<Object>) WireContext.create(commandDescriptor);
+    command.execute(environment);
+    return null;
+  }
+
+}

Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java	2008-08-05 13:32:22 UTC (rev 1824)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/job/JobImpl.java	2008-08-05 16:42:37 UTC (rev 1825)
@@ -5,6 +5,7 @@
 
 import org.jbpm.pvm.internal.cmd.Command;
 import org.jbpm.pvm.internal.model.ExecutionImpl;
+import org.jbpm.pvm.internal.wire.Descriptor;
 import org.jbpm.pvm.job.Job;
 
 public abstract class JobImpl<T> implements Command<T>, Serializable, Job {
@@ -49,6 +50,9 @@
   /** number of attempts left to try.  Should be decremented each time an exception 
    * occurs during command execution. */
   protected int retries = 3;
+  
+  /** a command that can be used as the behaviour of this job */ 
+  protected Descriptor commandDescriptor;
 
   public JobImpl() {
   }
@@ -112,4 +116,10 @@
   public void setLockExpirationTime(Date lockExpirationTime) {
     this.lockExpirationTime = lockExpirationTime;
   }
+  public Descriptor getCommandDescriptor() {
+    return commandDescriptor;
+  }
+  public void setCommandDescriptor(Descriptor commandDescriptor) {
+    this.commandDescriptor = commandDescriptor;
+  }
 }

Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java	2008-08-05 13:32:22 UTC (rev 1824)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/ObjectReference.java	2008-08-05 16:42:37 UTC (rev 1825)
@@ -32,6 +32,7 @@
   // private static final Log log = Log.getLog(ObjectReference.class.getName());
 
   protected String expression;
+  protected String expressionLanguage;
   protected Descriptor descriptor;
   protected T object;
 
@@ -83,10 +84,7 @@
   // object builders //////////////////////////////////////////////////////////
 
   protected T constructFromDescriptor() {
-    WireDefinition wireDefinition = new WireDefinition();
-    wireDefinition.addDescriptor("o", descriptor);
-    WireContext wireContext = new WireContext(wireDefinition);
-    return (T) wireContext.get("o");
+    return (T) WireContext.create(descriptor);
   }
 
   protected T resolveValueExpression() {

Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java	2008-08-05 13:32:22 UTC (rev 1824)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/model/VariableDefinitionImpl.java	2008-08-05 16:42:37 UTC (rev 1825)
@@ -60,7 +60,7 @@
 
   public Object getSourceValue(ExecutionImpl execution) {
     if (sourceDescriptor!=null) {
-      return sourceDescriptor.construct(new WireContext());
+      return WireContext.create(sourceDescriptor);
     }
     if (source!=null) {
       return execution.getVariable(key);

Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java	2008-08-05 13:32:22 UTC (rev 1824)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java	2008-08-05 16:42:37 UTC (rev 1825)
@@ -260,6 +260,12 @@
       create();
     }
   }
+  
+  /** convenience method that wires the object for a given descriptor. */
+  public static Object create(Descriptor descriptor) {
+    WireContext wireContext = new WireContext();
+    return wireContext.create(descriptor, false);
+  }
 
   /**
    * initializes the eager objects and then fires the create event.  This method
@@ -619,14 +625,16 @@
     WireObjectEventInfo wireEvent = null;
 
     // first fire the event on the descriptor for object specific listeners
-    Map<String, Descriptor> descriptors = wireDefinition.getDescriptors();
-    if (descriptors!=null) {
-      Descriptor descriptor = descriptors.get(objectName);
-      if (descriptor!=null) {
-        if (wireEvent==null) {
-          wireEvent = new WireObjectEventInfo(eventName, objectName, object);
+    if (wireDefinition!=null) {
+      Map<String, Descriptor> descriptors = wireDefinition.getDescriptors();
+      if (descriptors!=null) {
+        Descriptor descriptor = descriptors.get(objectName);
+        if (descriptor!=null) {
+          if (wireEvent==null) {
+            wireEvent = new WireObjectEventInfo(eventName, objectName, object);
+          }
+          descriptor.fire(eventName, wireEvent);
         }
-        descriptor.fire(eventName, wireEvent);
       }
     }
 

Modified: jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/test/base/EnvironmentDbTestCase.java
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/test/base/EnvironmentDbTestCase.java	2008-08-05 13:32:22 UTC (rev 1824)
+++ jbpm4/pvm/trunk/modules/core/src/main/java/org/jbpm/pvm/test/base/EnvironmentDbTestCase.java	2008-08-05 16:42:37 UTC (rev 1825)
@@ -47,6 +47,13 @@
   
   Transaction transaction = null;
   
+  public EnvironmentDbTestCase() {
+  }
+
+  public EnvironmentDbTestCase(String configResource) {
+    super(configResource);
+  }
+
   public void setUp() throws Exception {
     if (isEnvironmentFactoryCached()) {
       Db.clean(getEnvironmentFactory());




More information about the jbpm-commits mailing list