[jbpm-commits] JBoss JBPM SVN: r4200 - in jbpm4/branches/tbaeyens/modules: distro/src/main/resources/config-tool/jbpm/wire.bindings and 8 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Mar 9 16:48:21 EDT 2009
Author: tom.baeyens at jboss.com
Date: 2009-03-09 16:48:20 -0400 (Mon, 09 Mar 2009)
New Revision: 4200
Added:
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/SerializeInterceptorBinding.java
Removed:
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializingCommandService.java
Modified:
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml
jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml
jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java
jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml
Log:
work
Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/jbpm.cfg.xml 2009-03-09 18:13:19 UTC (rev 4199)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/jbpm.cfg.xml 2009-03-09 20:48:20 UTC (rev 4200)
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
-
- <process-engine-context>
-
- <process-service />
- <execution-service />
- <history-service />
- <management-service />
- <identity-service />
- <task-service />
-
- <command-service>
- <retry-interceptor />
- <environment-interceptor />
- <standard-transaction-interceptor />
- </command-service>
-
- <hibernate-configuration cfg="jbpm.hibernate.cfg.xml">
- <cache-configuration resource="jbpm.cache.xml"
- usage="nonstrict-read-write" />
- </hibernate-configuration>
-
- <hibernate-session-factory />
-
- <deployer-manager>
- <assign-file-type>
- <file extension=".jpdl.xml" type="jpdl" />
- </assign-file-type>
- <parse-jpdl />
- <check-process />
- <check-problems />
- <save />
- </deployer-manager>
-
- <script-manager default-expression-language="juel"
- default-script-language="juel"
- read-contexts="execution, environment, process-engine"
- write-context="">
- <script-language name="juel" factory="com.sun.script.juel.JuelScriptEngineFactory" />
- </script-manager>
-
- <job-executor auto-start="false" />
-
- <id-generator />
- <types resource="jbpm.variable.types.xml" />
-
- <business-calendar>
- <monday hours="9:00-12:00 and 12:30-17:00"/>
- <tuesday hours="9:00-12:00 and 12:30-17:00"/>
- <wednesday hours="9:00-12:00 and 12:30-17:00"/>
- <thursday hours="9:00-12:00 and 12:30-17:00"/>
- <friday hours="9:00-12:00 and 12:30-17:00"/>
- <holiday period="01/07/2008 - 31/08/2008"/>
- </business-calendar>
-
- </process-engine-context>
-
- <transaction-context>
- <hibernate-session />
- <transaction />
- <pvm-db-session />
- <job-db-session />
- <task-db-session />
- <message-session />
- <timer-session />
- <history-session />
- <identity-session realm="realm://jbpm-identity" />
- </transaction-context>
-
-</jbpm-configuration>
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml 2009-03-09 18:13:19 UTC (rev 4199)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/part1.jbpm.wire.bindings.xml 2009-03-09 20:48:20 UTC (rev 4200)
@@ -77,11 +77,12 @@
<binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" />
<!-- operation -->
<binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" />
Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-03-09 18:13:19 UTC (rev 4199)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-03-09 20:48:20 UTC (rev 4200)
@@ -11,8 +11,9 @@
<task-service />
<identity-service />
- <command-service serialize="true">
+ <command-service>
<retry-interceptor />
+ <serialize-interceptor />
<environment-interceptor />
<standard-transaction-interceptor />
</command-service>
Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml 2009-03-09 18:13:19 UTC (rev 4199)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml 2009-03-09 20:48:20 UTC (rev 4200)
@@ -77,13 +77,14 @@
<binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" />
<!-- operation -->
<binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" />
<!-- jpdl bindings -->
<binding class="org.jbpm.jpdl.internal.xml.ParseJpdlBinding" />
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml 2009-03-09 18:13:19 UTC (rev 4199)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml 2009-03-09 20:48:20 UTC (rev 4200)
@@ -77,13 +77,14 @@
<binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" />
<!-- operation -->
<binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" />
<!-- jpdl bindings -->
<binding class="org.jbpm.jpdl.internal.xml.ParseJpdlBinding" />
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java 2009-03-09 18:13:19 UTC (rev 4199)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/AddReplyCommentCmd.java 2009-03-09 20:48:20 UTC (rev 4200)
@@ -21,6 +21,7 @@
*/
package org.jbpm.pvm.internal.cmd;
+import org.jbpm.JbpmException;
import org.jbpm.cmd.Command;
import org.jbpm.env.Environment;
import org.jbpm.model.Comment;
@@ -46,6 +47,9 @@
public Comment execute(Environment environment) throws Exception {
DbSession dbSession = environment.get(DbSession.class);
CommentImpl parentComment = dbSession.get(CommentImpl.class, commentDbid);
+ if (parentComment==null) {
+ throw new JbpmException("parent comment doesn't exist: "+commentDbid);
+ }
Comment replyComment = parentComment.createComment(message);
return replyComment;
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java 2009-03-09 18:13:19 UTC (rev 4199)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/DeploymentImpl.java 2009-03-09 20:48:20 UTC (rev 4200)
@@ -268,7 +268,8 @@
}
public Deployment deploy() {
- processDefinitions.addAll(processServiceImpl.deploy(this));
+ List<ProcessDefinition> deployedProcessDefinitions = processServiceImpl.deploy(this);
+ processDefinitions.addAll(deployedProcessDefinitions);
return this;
}
@@ -341,8 +342,10 @@
if (files!=null) {
Map<String, StreamInput> replacedFiles = new HashMap<String, StreamInput>();
for (Map.Entry<String, StreamInput> entry: files.entrySet()) {
- byte[] bytes = IoUtil.readBytes(entry.getValue().openStream());
- replacedFiles.put(entry.getKey(), new ByteArrayStreamInput(bytes));
+ if (! (entry.getValue() instanceof ByteArrayStreamInput)) {
+ byte[] bytes = IoUtil.readBytes(entry.getValue().openStream());
+ replacedFiles.put(entry.getKey(), new ByteArrayStreamInput(bytes));
+ }
}
files = replacedFiles;
}
@@ -352,9 +355,4 @@
return this;
}
- protected Object readResolve() throws ObjectStreamException {
- processServiceImpl = Environment.getFromCurrent(ProcessServiceImpl.class);
- return this;
- }
-
}
Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java (from rev 4199, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializingCommandService.java)
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java (rev 0)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java 2009-03-09 20:48:20 UTC (rev 4200)
@@ -0,0 +1,61 @@
+/*
+ * 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.svc;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import org.jbpm.JbpmException;
+import org.jbpm.cmd.Command;
+import org.jbpm.internal.log.Log;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class SerializeInterceptor extends Interceptor {
+
+ private static final Log log = Log.getLog(SerializeInterceptor.class.getName());
+
+ public <T> T execute(Command<T> command) {
+ log.info("serializing command "+command);
+ Command<T> serializedCommand = (Command<T>) serialize(command);
+ T returnValue = next.execute(serializedCommand);
+ T serializedReturnValue = (T) serialize(returnValue);
+ return serializedReturnValue;
+ }
+
+ public Object serialize(Object o) {
+ try {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutputStream oos = new ObjectOutputStream(baos);
+ oos.writeObject(o);
+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+ ObjectInputStream ois = new ObjectInputStream(bais);
+ return ois.readObject();
+ } catch (Exception e) {
+ throw new JbpmException("serialization exception", e);
+ }
+ }
+}
Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializeInterceptor.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializingCommandService.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializingCommandService.java 2009-03-09 18:13:19 UTC (rev 4199)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/svc/SerializingCommandService.java 2009-03-09 20:48:20 UTC (rev 4200)
@@ -1,61 +0,0 @@
-/*
- * 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.svc;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
-import org.jbpm.JbpmException;
-import org.jbpm.cmd.Command;
-import org.jbpm.internal.log.Log;
-
-
-/**
- * @author Tom Baeyens
- */
-public class SerializingCommandService extends DefaultCommandService {
-
- private static final Log log = Log.getLog(SerializingCommandService.class.getName());
-
- public <T> T execute(Command<T> command) {
- log.info("serializing command "+command);
- Command serializedCommand = (Command) serialize(command);
- T returnValue = (T) super.execute(serializedCommand);
- T serializedReturnValue = (T) serialize(returnValue);
- return serializedReturnValue;
- }
-
- public Object serialize(Object o) {
- try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos);
- oos.writeObject(o);
- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
- ObjectInputStream ois = new ObjectInputStream(bais);
- return ois.readObject();
- } catch (Exception e) {
- throw new JbpmException("serialization exception", e);
- }
- }
-}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java 2009-03-09 18:13:19 UTC (rev 4199)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/CommandServiceBinding.java 2009-03-09 20:48:20 UTC (rev 4200)
@@ -26,7 +26,7 @@
import org.jbpm.cmd.CommandService;
import org.jbpm.pvm.internal.svc.AsyncCommandService;
import org.jbpm.pvm.internal.svc.DefaultCommandService;
-import org.jbpm.pvm.internal.svc.SerializingCommandService;
+import org.jbpm.pvm.internal.svc.SerializeInterceptor;
import org.jbpm.pvm.internal.util.XmlUtil;
import org.jbpm.pvm.internal.wire.Descriptor;
import org.jbpm.pvm.internal.wire.descriptor.CommandServiceDescriptor;
@@ -67,11 +67,6 @@
}
protected CommandService getCommandService(Element element, Parse parse, Parser parser) {
- if ( XmlUtil.attributeBoolean(element, "serialize", false, parse, Boolean.FALSE)) {
-
- return new SerializingCommandService();
- }
-
if ( XmlUtil.attributeBoolean(element, "async", false, parse, Boolean.FALSE)) {
AsyncCommandService asyncCommandService = new AsyncCommandService();
Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/SerializeInterceptorBinding.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/SerializeInterceptorBinding.java (rev 0)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/SerializeInterceptorBinding.java 2009-03-09 20:48:20 UTC (rev 4200)
@@ -0,0 +1,44 @@
+/*
+ * 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.wire.binding;
+
+import org.jbpm.pvm.internal.svc.SerializeInterceptor;
+import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor;
+import org.jbpm.pvm.internal.xml.Parse;
+import org.jbpm.pvm.internal.xml.Parser;
+import org.w3c.dom.Element;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class SerializeInterceptorBinding extends WireInterceptorBinding {
+
+ public SerializeInterceptorBinding() {
+ super("serialize-interceptor");
+ }
+
+ public Object parse(Element element, Parse parse, Parser parser) {
+ return new ProvidedObjectDescriptor(new SerializeInterceptor());
+ }
+
+}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-03-09 18:13:19 UTC (rev 4199)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-03-09 20:48:20 UTC (rev 4200)
@@ -77,13 +77,14 @@
<binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" />
<!-- operation -->
<binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" />
</wire-bindings>
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java 2009-03-09 18:13:19 UTC (rev 4199)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/task/TaskParticipationsTest.java 2009-03-09 20:48:20 UTC (rev 4200)
@@ -41,10 +41,8 @@
public void testTaskParticipants() {
Task task = taskService.newTask();
task.setName("do laundry");
- saveAndRegisterTask(task);
+ long taskDbid = saveAndRegisterTask(task);
- long taskDbid = task.getDbid();
-
taskService.addTaskParticipant(taskDbid, new UserRef("johndoe"), Participant.CANDIDATE);
taskService.addTaskParticipant(taskDbid, new UserRef("joesmoe"), Participant.CANDIDATE);
taskService.addTaskParticipant(taskDbid, new UserRef("joesmoe"), Participant.OWNER);
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-03-09 18:13:19 UTC (rev 4199)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-03-09 20:48:20 UTC (rev 4200)
@@ -11,8 +11,9 @@
<task-service />
<identity-service />
- <command-service serialize="true">
+ <command-service>
<retry-interceptor />
+ <serialize-interceptor />
<environment-interceptor />
<standard-transaction-interceptor />
</command-service>
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml 2009-03-09 18:13:19 UTC (rev 4199)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml 2009-03-09 20:48:20 UTC (rev 4200)
@@ -77,13 +77,14 @@
<binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" />
- <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" />
<!-- operation -->
<binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" />
<binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" />
+ <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" />
<!-- jpdl bindings -->
<binding class="org.jbpm.jpdl.internal.xml.ParseJpdlBinding" />
More information about the jbpm-commits
mailing list