[jbpm-commits] JBoss JBPM SVN: r3160 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/wire/xml and 4 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Dec 2 03:46:03 EST 2008
Author: tom.baeyens at jboss.com
Date: 2008-12-02 03:46:03 -0500 (Tue, 02 Dec 2008)
New Revision: 3160
Added:
jbpm4/trunk/modules/task/src/main/resources/jbpm.task.default.lifecycle.xml
jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml
jbpm4/trunk/modules/task/src/main/resources/jbpm.task.queries.hbm.xml
jbpm4/trunk/modules/task/src/main/resources/jbpm.task.wire.bindings.xml
Removed:
jbpm4/trunk/modules/task/src/main/resources/hibernate.task.hbm.xml
jbpm4/trunk/modules/task/src/main/resources/hibernate.task.queries.hbm.xml
jbpm4/trunk/modules/task/src/main/resources/pvm.hibernate.mappings.xml
jbpm4/trunk/modules/task/src/main/resources/pvm.wire.bindings.xml
jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml
jbpm4/trunk/modules/task/src/test/resources/org.jbpm.task.cfg.xml
jbpm4/trunk/modules/task/src/test/resources/org/
Modified:
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java
jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java
jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java
jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java
jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml
Log:
brought task component in sync with the new resource structure
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-12-01 16:28:48 UTC (rev 3159)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-12-02 08:46:03 UTC (rev 3160)
@@ -183,15 +183,17 @@
ActivityParser activityParser = new ActivityParser();
for (String activityResource: DEFAULT_ACTIVITIES_RESOURCES) {
- InputStream inputStream = ReflectUtil.getResourceAsStream(null, activityResource);
- if (inputStream!=null) {
- log.trace("parsing jpdl activities from resource: "+activityResource);
-
- activityParser.createParse()
- .setInputStream(inputStream)
- .pushObject(defaultBindings)
- .execute()
- .checkProblems("jpdl activities from resource "+activityResource);
+ Enumeration<URL> resourceUrls = ReflectUtil.getResources(null, activityResource);
+ if (resourceUrls.hasMoreElements()) {
+ while (resourceUrls.hasMoreElements()) {
+ URL resourceUrl = resourceUrls.nextElement();
+ log.trace("loading jpdl activities from resource: "+resourceUrl);
+ activityParser.createParse()
+ .setUrl(resourceUrl)
+ .pushObject(defaultBindings)
+ .execute()
+ .checkProblems("jpdl activities from "+resourceUrl.toString());
+ }
} else {
log.trace("skipping unavailable jpdl activities resource: "+activityResource);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java 2008-12-01 16:28:48 UTC (rev 3159)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java 2008-12-02 08:46:03 UTC (rev 3160)
@@ -1,6 +1,5 @@
package org.jbpm.pvm.internal.wire.xml;
-import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
@@ -130,6 +129,7 @@
public static final String[] DEFAULT_WIRE_BINDING_RESOURCES = new String[]{
"jbpm.pvm.wire.bindings.xml",
"jbpm.jpdl.wire.bindings.xml",
+ "jbpm.task.wire.bindings.xml",
"jbpm.user.wire.bindings.xml"
};
@@ -299,14 +299,17 @@
BindingParser bindingParser = new BindingParser();
for (String wireResource: DEFAULT_WIRE_BINDING_RESOURCES) {
- InputStream inputStream = ReflectUtil.getResourceAsStream(null, wireResource);
- if (inputStream!=null) {
- log.trace("loading wire bindings from resource: "+wireResource);
- bindingParser.createParse()
- .setInputStream(inputStream)
- .pushObject(defaultBindings)
- .execute()
- .checkProblems("default wire bindings");
+ Enumeration<URL> resourceUrls = ReflectUtil.getResources(null, wireResource);
+ if (resourceUrls.hasMoreElements()) {
+ while (resourceUrls.hasMoreElements()) {
+ URL resourceUrl = resourceUrls.nextElement();
+ log.trace("loading wire bindings from resource: "+resourceUrl);
+ bindingParser.createParse()
+ .setUrl(resourceUrl)
+ .pushObject(defaultBindings)
+ .execute()
+ .checkProblems(resourceUrl.toString());
+ }
} else {
log.trace("skipping unavailable wire bindings resource "+wireResource);
}
Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java
===================================================================
--- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java 2008-12-01 16:28:48 UTC (rev 3159)
+++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java 2008-12-02 08:46:03 UTC (rev 3160)
@@ -311,7 +311,7 @@
public String getLifeCycleResource() {
// the default lifecycle can be overridden in subclasses
- return "org/jbpm/task/impl/default.lifecycle.xml";
+ return "jbpm.task.default.lifecycle.xml";
}
// modified getters and setters /////////////////////////////////////////////
Deleted: jbpm4/trunk/modules/task/src/main/resources/hibernate.task.hbm.xml
===================================================================
--- jbpm4/trunk/modules/task/src/main/resources/hibernate.task.hbm.xml 2008-12-01 16:28:48 UTC (rev 3159)
+++ jbpm4/trunk/modules/task/src/main/resources/hibernate.task.hbm.xml 2008-12-02 08:46:03 UTC (rev 3160)
@@ -1,152 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-<hibernate-mapping auto-import="false" package="org.jbpm.task.impl" default-access="field">
-
- <!-- ### TASK DEFINITION ################################################ -->
- <class name="TaskDefinitionImpl" discriminator-value="T">
- <id name="dbid" column="DBID_">
- <generator class="native" />
- </id>
- <discriminator type="char" column="CLASS_"/>
- <version name="dbversion" column="DBVERSION_" />
-
- <property name="name" column="NAME_"/>
- <property name="description" column="DESCR_"/>
-
- <property name="priority" column="PRIORITY_"/>
- <property name="dueDateDuration" column="DUEDATE_"/>
- <property name="isBlocking" column="BLOCK_"/>
- <property name="isSignalling" column="SIGNAL_"/>
- <property name="assigneeExpression" column="ASSIGNEE_EXPR_"/>
- <property name="candidatesExpression" column="CANDIDATES_EXPR_"/>
-
- <many-to-one name="assignerDescriptor"
- column="ASSIGNER_DESCR_"
- cascade="all"
- class="org.jbpm.wire.descriptor.AbstractDescriptor"
- foreign-key="FK_TSK_ASIG_DESCR"
- index="IDX_TSK_ASIG_DESCR" />
-
- <many-to-one name="swimlaneDefinition"
- column="SWIMLANE_DEF_"
- cascade="all"
- class="SwimlaneDefinitionImpl"
- foreign-key="FK_TSK_SWIML_DEF"
- index="IDX_TSK_SWIML_DEF" />
-
- <list name="subTaskDefinitions" cascade="all-delete-orphan">
- <key column="TASKDEF_" />
- <list-index column="TASKDEF_IDX_" />
- <one-to-many class="TaskDefinitionImpl" />
- </list>
- </class>
-
- <!-- ### TASK ########################################################### -->
- <class name="TaskImpl"
- discriminator-value="T">
- <id name="dbid" column="DBID_">
- <generator class="native" />
- </id>
- <discriminator type="char" column="CLASS_"/>
- <version name="dbversion" column="DBVERSION_" />
-
- <property name="name" column="NAME_"/>
- <property name="description" column="DESCR_"/>
- <property name="assignee" column="ASSIGNEE_"/>
-
- <set name="roles" cascade="all-delete-orphan">
- <key column="TASK_" foreign-key="FK_ROLE_TASK" />
- <one-to-many class="RoleImpl" />
- </set>
-
- <property name="priority" column="PRIORITY_"/>
- <property name="create" column="CREATE_"/>
- <property name="dueDate" column="DUEDATE_"/>
- <property name="progress" column="PROGRESS_"/>
-
- <many-to-one name="variableMap"
- class="org.jbpm.pvm.impl.VariableMap"
- column="VARMAP_"
- foreign-key="FK_TASK_VARMAP"
- cascade="all" />
-
- <many-to-one name="swimlane"
- class="SwimlaneImpl"
- column="SWIMLANE_"
- foreign-key="FK_TASK_SWIML" />
-
- <many-to-one name="taskDefinition"
- column="TASK_DEF_"
- class="TaskDefinitionImpl"
- foreign-key="FK_TSK_DEF"
- index="IDX_TSK_DEF" />
-
- <list name="comments" cascade="all-delete-orphan">
- <key column="TASK_" />
- <list-index column="TASK_IDX_" />
- <one-to-many class="org.jbpm.pvm.impl.CommentImpl" />
- </list>
-
- <set name="subTasks" cascade="all-delete-orphan">
- <key column="SUPERTASK_" foreign-key="FK_TASK_SUPERTASK" />
- <one-to-many class="TaskImpl" />
- </set>
-
- </class>
-
- <!-- ### ROLE ########################################################### -->
- <class name="RoleImpl"
- discriminator-value="R">
- <id name="dbid" column="DBID_">
- <generator class="native" />
- </id>
- <discriminator type="char" column="CLASS_"/>
- <version name="dbversion" column="DBVERSION_" />
-
- <property name="identityId" column="IDENTITYID_"/>
- <property name="roleType" type="org.jbpm.task.RoleType" column="ROLETYPE_" />
- <property name="description" column="DESCR_"/>
-
- <many-to-one name="task"
- class="TaskImpl"
- column="TASK_"
- foreign-key="FK_ROLE_TASK" />
-
- </class>
-
- <!-- ### SWIMLANE DEFINITION ############################################ -->
- <class name="SwimlaneDefinitionImpl">
- <id name="dbid" column="DBID_">
- <generator class="native" />
- </id>
- <version name="dbversion" column="DBVERSION_" />
-
- <property name="name" column="NAME_"/>
- </class>
-
-
- <!-- ### SWIMLANE ####################################################### -->
- <class name="SwimlaneImpl">
- <id name="dbid" column="DBID_">
- <generator class="native" />
- </id>
- <version name="dbversion" column="DBVERSION_" />
-
- <property name="name" column="NAME_"/>
- <property name="assignee" column="ASSIGNEE_"/>
-
- <many-to-one name="swimlaneDefinition"
- class="SwimlaneDefinitionImpl"
- column="SWIMLANEDEF_"
- foreign-key="FK_SWIMLANE_DEF" />
-
- <set name="candidates" cascade="all-delete-orphan">
- <key column="SWIMLANE_" foreign-key="FK_ROLE_SWIMLANE" />
- <one-to-many class="RoleImpl" />
- </set>
-
- </class>
-
-</hibernate-mapping>
Deleted: jbpm4/trunk/modules/task/src/main/resources/hibernate.task.queries.hbm.xml
===================================================================
--- jbpm4/trunk/modules/task/src/main/resources/hibernate.task.queries.hbm.xml 2008-12-01 16:28:48 UTC (rev 3159)
+++ jbpm4/trunk/modules/task/src/main/resources/hibernate.task.queries.hbm.xml 2008-12-02 08:46:03 UTC (rev 3160)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping>
-
-
- <query name="findTasks">
- <![CDATA[
- select task
- from org.jbpm.task.impl.TaskImpl as task
- ]]>
- </query>
-
-
-</hibernate-mapping>
\ No newline at end of file
Copied: jbpm4/trunk/modules/task/src/main/resources/jbpm.task.default.lifecycle.xml (from rev 3143, jbpm4/trunk/modules/task/src/test/resources/org/jbpm/task/impl/default.lifecycle.xml)
===================================================================
--- jbpm4/trunk/modules/task/src/main/resources/jbpm.task.default.lifecycle.xml (rev 0)
+++ jbpm4/trunk/modules/task/src/main/resources/jbpm.task.default.lifecycle.xml 2008-12-02 08:46:03 UTC (rev 3160)
@@ -0,0 +1,13 @@
+<task-lifecycle initial="open">
+ <state name="open">
+ <transition name="complete" to="completed" />
+ <transition name="suspend" to="suspended" />
+ <transition name="cancel" to="cancelled" />
+ </state>
+ <state name="suspended">
+ <transition name="resume" to="open" />
+ <transition name="cancel" to="cancelled" />
+ </state>
+ <state name="cancelled" />
+ <state name="completed" />
+</task-lifecycle>
Copied: jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml (from rev 3143, jbpm4/trunk/modules/task/src/main/resources/hibernate.task.hbm.xml)
===================================================================
--- jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml (rev 0)
+++ jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml 2008-12-02 08:46:03 UTC (rev 3160)
@@ -0,0 +1,154 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping auto-import="false" package="org.jbpm.task.impl" default-access="field">
+
+ <!-- ### TASK DEFINITION ################################################ -->
+ <class name="TaskDefinitionImpl" discriminator-value="T">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <discriminator type="char" column="CLASS_"/>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_"/>
+ <property name="description" column="DESCR_"/>
+
+ <property name="priority" column="PRIORITY_"/>
+ <property name="dueDateDuration" column="DUEDATE_"/>
+ <property name="isBlocking" column="BLOCK_"/>
+ <property name="isSignalling" column="SIGNAL_"/>
+ <property name="assigneeExpression" column="ASSIGNEE_EXPR_"/>
+ <property name="candidatesExpression" column="CANDIDATES_EXPR_"/>
+
+ <many-to-one name="assignerDescriptor"
+ column="ASSIGNER_DESCR_"
+ cascade="all"
+ class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor"
+ foreign-key="FK_TSK_ASIG_DESCR"
+ index="IDX_TSK_ASIG_DESCR" />
+
+ <many-to-one name="swimlaneDefinition"
+ column="SWIMLANE_DEF_"
+ cascade="all"
+ class="SwimlaneDefinitionImpl"
+ foreign-key="FK_TSK_SWIML_DEF"
+ index="IDX_TSK_SWIML_DEF" />
+
+ <list name="subTaskDefinitions" cascade="all-delete-orphan">
+ <key column="TASKDEF_" />
+ <list-index column="TASKDEF_IDX_" />
+ <one-to-many class="TaskDefinitionImpl" />
+ </list>
+ </class>
+
+ <!-- ### TASK ########################################################### -->
+ <class name="TaskImpl"
+ discriminator-value="T">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <discriminator type="char" column="CLASS_"/>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_"/>
+ <property name="description" column="DESCR_"/>
+ <property name="assignee" column="ASSIGNEE_"/>
+
+ <set name="roles" cascade="all-delete-orphan">
+ <key column="TASK_" foreign-key="FK_ROLE_TASK" />
+ <one-to-many class="RoleImpl" />
+ </set>
+
+ <property name="priority" column="PRIORITY_"/>
+ <property name="create" column="CREATE_"/>
+ <property name="dueDate" column="DUEDATE_"/>
+ <property name="progress" column="PROGRESS_"/>
+
+ <!--
+ <many-to-one name="variableMap"
+ class="org.jbpm.pvm.impl.VariableMap"
+ column="VARMAP_"
+ foreign-key="FK_TASK_VARMAP"
+ cascade="all" />
+ -->
+
+ <many-to-one name="swimlane"
+ class="SwimlaneImpl"
+ column="SWIMLANE_"
+ foreign-key="FK_TASK_SWIML" />
+
+ <many-to-one name="taskDefinition"
+ column="TASK_DEF_"
+ class="TaskDefinitionImpl"
+ foreign-key="FK_TSK_DEF"
+ index="IDX_TSK_DEF" />
+
+ <list name="comments" cascade="all-delete-orphan">
+ <key column="TASK_" />
+ <list-index column="TASK_IDX_" />
+ <one-to-many class="org.jbpm.pvm.internal.model.CommentImpl" />
+ </list>
+
+ <set name="subTasks" cascade="all-delete-orphan">
+ <key column="SUPERTASK_" foreign-key="FK_TASK_SUPERTASK" />
+ <one-to-many class="TaskImpl" />
+ </set>
+
+ </class>
+
+ <!-- ### ROLE ########################################################### -->
+ <class name="RoleImpl"
+ discriminator-value="R">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <discriminator type="char" column="CLASS_"/>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="identityId" column="IDENTITYID_"/>
+ <property name="roleType" column="ROLETYPE_" />
+ <property name="description" column="DESCR_"/>
+
+ <many-to-one name="task"
+ class="TaskImpl"
+ column="TASK_"
+ foreign-key="FK_ROLE_TASK" />
+
+ </class>
+
+ <!-- ### SWIMLANE DEFINITION ############################################ -->
+ <class name="SwimlaneDefinitionImpl">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_"/>
+ </class>
+
+
+ <!-- ### SWIMLANE ####################################################### -->
+ <class name="SwimlaneImpl">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_"/>
+ <property name="assignee" column="ASSIGNEE_"/>
+
+ <many-to-one name="swimlaneDefinition"
+ class="SwimlaneDefinitionImpl"
+ column="SWIMLANEDEF_"
+ foreign-key="FK_SWIMLANE_DEF" />
+
+ <set name="candidates" cascade="all-delete-orphan">
+ <key column="SWIMLANE_" foreign-key="FK_ROLE_SWIMLANE" />
+ <one-to-many class="RoleImpl" />
+ </set>
+
+ </class>
+
+</hibernate-mapping>
Property changes on: jbpm4/trunk/modules/task/src/main/resources/jbpm.task.hbm.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: jbpm4/trunk/modules/task/src/main/resources/jbpm.task.queries.hbm.xml (from rev 3143, jbpm4/trunk/modules/task/src/main/resources/hibernate.task.queries.hbm.xml)
===================================================================
--- jbpm4/trunk/modules/task/src/main/resources/jbpm.task.queries.hbm.xml (rev 0)
+++ jbpm4/trunk/modules/task/src/main/resources/jbpm.task.queries.hbm.xml 2008-12-02 08:46:03 UTC (rev 3160)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping>
+
+
+ <query name="findTasks">
+ <![CDATA[
+ select task
+ from org.jbpm.task.impl.TaskImpl as task
+ ]]>
+ </query>
+
+
+</hibernate-mapping>
\ No newline at end of file
Property changes on: jbpm4/trunk/modules/task/src/main/resources/jbpm.task.queries.hbm.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Copied: jbpm4/trunk/modules/task/src/main/resources/jbpm.task.wire.bindings.xml (from rev 3143, jbpm4/trunk/modules/task/src/main/resources/pvm.wire.bindings.xml)
===================================================================
--- jbpm4/trunk/modules/task/src/main/resources/jbpm.task.wire.bindings.xml (rev 0)
+++ jbpm4/trunk/modules/task/src/main/resources/jbpm.task.wire.bindings.xml 2008-12-02 08:46:03 UTC (rev 3160)
@@ -0,0 +1,6 @@
+<wire-bindings>
+
+ <binding tag="task-db-session" class="org.jbpm.task.xml.TaskDbSessionBinding" category="descriptor" />
+ <binding tag="task-service" class="org.jbpm.task.xml.TaskServiceBinding" category="descriptor" />
+
+</wire-bindings>
Property changes on: jbpm4/trunk/modules/task/src/main/resources/jbpm.task.wire.bindings.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: jbpm4/trunk/modules/task/src/main/resources/pvm.hibernate.mappings.xml
===================================================================
--- jbpm4/trunk/modules/task/src/main/resources/pvm.hibernate.mappings.xml 2008-12-01 16:28:48 UTC (rev 3159)
+++ jbpm4/trunk/modules/task/src/main/resources/pvm.hibernate.mappings.xml 2008-12-02 08:46:03 UTC (rev 3160)
@@ -1,4 +0,0 @@
-<mappings>
- <mapping resource="hibernate.task.hbm.xml" />
- <mapping resource="hibernate.task.queries.hbm.xml" />
-</mappings>
Deleted: jbpm4/trunk/modules/task/src/main/resources/pvm.wire.bindings.xml
===================================================================
--- jbpm4/trunk/modules/task/src/main/resources/pvm.wire.bindings.xml 2008-12-01 16:28:48 UTC (rev 3159)
+++ jbpm4/trunk/modules/task/src/main/resources/pvm.wire.bindings.xml 2008-12-02 08:46:03 UTC (rev 3160)
@@ -1,6 +0,0 @@
-<wire-bindings>
-
- <binding tag="task-db-session" class="org.jbpm.task.xml.TaskDbSessionBinding" category="descriptor" />
- <binding tag="task-service" class="org.jbpm.task.xml.TaskServiceBinding" category="descriptor" />
-
-</wire-bindings>
Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java
===================================================================
--- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java 2008-12-01 16:28:48 UTC (rev 3159)
+++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java 2008-12-02 08:46:03 UTC (rev 3160)
@@ -21,30 +21,12 @@
*/
package org.jbpm.task;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.jbpm.env.Environment;
-import org.jbpm.env.EnvironmentFactory;
-import org.jbpm.model.Comment;
-import org.jbpm.pvm.internal.util.Clock;
-import org.jbpm.pvm.internal.util.Priority;
-import org.jbpm.session.DbSession;
-import org.jbpm.task.impl.RoleImpl;
-import org.jbpm.task.impl.SwimlaneImpl;
-import org.jbpm.task.impl.TaskDefinitionImpl;
-import org.jbpm.task.impl.TaskImpl;
import org.jbpm.test.DbTestCase;
-import org.jbpm.test.EnvironmentDbTestCase;
/**
* @author Tom Baeyens
*/
-public class TaskDbTest extends EnvironmentDbTestCase {
+public class TaskDbTest extends DbTestCase {
public void testNothing() {
}
Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java
===================================================================
--- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java 2008-12-01 16:28:48 UTC (rev 3159)
+++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java 2008-12-02 08:46:03 UTC (rev 3160)
@@ -21,14 +21,6 @@
*/
package org.jbpm.task;
-import java.util.Date;
-import java.util.List;
-
-import org.hibernate.Session;
-import org.jbpm.cmd.Command;
-import org.jbpm.cmd.CommandService;
-import org.jbpm.env.Environment;
-import org.jbpm.task.impl.TaskImpl;
import org.jbpm.test.DbTestCase;
/**
Deleted: jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml
===================================================================
--- jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml 2008-12-01 16:28:48 UTC (rev 3159)
+++ jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml 2008-12-02 08:46:03 UTC (rev 3160)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
-
- <process-engine>
-
- <deployer-manager>
- <assign-file-type>
- <file extension=".jpdl.xml" type="jpdl" />
- </assign-file-type>
- <check-process-version />
- <check-process-id />
- <check-problems />
- <save />
- </deployer-manager>
-
- <process-service />
- <execution-service />
- <management-service />
-
- <command-service>
- <retry-interceptor />
- <environment-interceptor />
- <standard-transaction-interceptor />
- </command-service>
-
- <hibernate-configuration>
- <properties resource="hibernate.properties" />
- <mapping resource="jbpm.pvm.typedefs.hbm.xml" />
- <mapping resource="jbpm.pvm.wire.hbm.xml" />
- <mapping resource="jbpm.pvm.definition.hbm.xml" />
- <mapping resource="jbpm.pvm.execution.hbm.xml" />
- <mapping resource="jbpm.pvm.variable.hbm.xml" />
- <mapping resource="jbpm.pvm.job.hbm.xml" />
- <cache-configuration resource="jbpm.pvm.cache.xml"
- usage="nonstrict-read-write" />
- </hibernate-configuration>
-
- <hibernate-session-factory />
-
- <job-executor auto-start="false" />
- <job-test-helper />
-
- <id-generator />
- <variable-types resource="jbpm.pvm.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>
-
- <environment>
- <hibernate-session />
- <transaction />
- <pvm-db-session />
- <job-db-session />
- <message-session />
- <timer-session />
- </environment>
-
-</jbpm-configuration>
Modified: jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2008-12-01 16:28:48 UTC (rev 3159)
+++ jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2008-12-02 08:46:03 UTC (rev 3160)
@@ -32,6 +32,7 @@
<mapping resource="jbpm.pvm.execution.hbm.xml" />
<mapping resource="jbpm.pvm.variable.hbm.xml" />
<mapping resource="jbpm.pvm.job.hbm.xml" />
+ <mapping resource="jbpm.task.hbm.xml" />
<cache-configuration resource="jbpm.pvm.cache.xml"
usage="nonstrict-read-write" />
</hibernate-configuration>
Deleted: jbpm4/trunk/modules/task/src/test/resources/org.jbpm.task.cfg.xml
===================================================================
--- jbpm4/trunk/modules/task/src/test/resources/org.jbpm.task.cfg.xml 2008-12-01 16:28:48 UTC (rev 3159)
+++ jbpm4/trunk/modules/task/src/test/resources/org.jbpm.task.cfg.xml 2008-12-02 08:46:03 UTC (rev 3160)
@@ -1,37 +0,0 @@
-<environment>
-
- <application>
-
- <pvm-service />
- <task-service />
-
- <standard-command-service>
- <retry-interceptor />
- <environment-interceptor />
- <transaction-interceptor />
- </standard-command-service>
-
- <hibernate-configuration>
- <properties resource="hibernate.properties" />
- <mapping resource="jbpm.pvm.typedefs.hbm.xml" />
- <mapping resource="jbpm.pvm.wire.hbm.xml" />
- <mapping resource="jbpm.pvm.definition.hbm.xml" />
- <mapping resource="jbpm.pvm.execution.hbm.xml" />
- <mapping resource="jbpm.pvm.variable.hbm.xml" />
- <mapping resource="jbpm.pvm.job.hbm.xml" />
- <cache-configuration resource="jbpm.pvm.cache.xml"
- usage="nonstrict-read-write" />
- </hibernate-configuration>
- <hibernate-session-factory />
- <variable-types resource="pvm.variable.types.xml" />
-
- </application>
-
- <block>
- <standard-transaction />
- <hibernate-session />
- <pvm-db-session />
- <task-db-session />
- </block>
-
-</environment>
More information about the jbpm-commits
mailing list