[jbpm-commits] JBoss JBPM SVN: r4607 - in jbpm4/branches/tbaeyens: hudson/jboss and 26 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-04-23 11:16:20 -0400 (Thu, 23 Apr 2009) New Revision: 4607 Added: jbpm4/branches/tbaeyens/hudson/goals.txt jbpm4/branches/tbaeyens/hudson/jboss/build.xml jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.default.cfg.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.history.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.cfg.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.repository.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.variable.types.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.wire.bindings.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity/ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java Removed: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.history.hbm.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.hbm.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.activities.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.eventlisteners.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.repository.hbm.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.hbm.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.lifecycle.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.variable.types.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jndi.properties jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.activities.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.eventlisteners.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.hbm.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.lifecycle.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.variable.types.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/wire/binding/EnvironmentFactoryRefBinding.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.activities.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.eventlisteners.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.repository.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.lifecycle.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.variable.types.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cache.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.history.hbm.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.cfg.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.hbm.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.activities.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.eventlisteners.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.repository.hbm.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.hbm.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.lifecycle.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.variable.types.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml Modified: jbpm4/branches/tbaeyens/hudson/ jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/Deployment.java jbpm4/branches/tbaeyens/modules/examples/pom.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/logging.properties jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml jbpm4/branches/tbaeyens/modules/pvm/pom.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java jbpm4/branches/tbaeyens/modules/test-db/pom.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml Log: config file simplifications Property changes on: jbpm4/branches/tbaeyens/hudson ___________________________________________________________________ Name: svn:ignore - *.iml ant.properties target + *.iml ant.properties target Added: jbpm4/branches/tbaeyens/hudson/goals.txt =================================================================== --- jbpm4/branches/tbaeyens/hudson/goals.txt (rev 0) +++ jbpm4/branches/tbaeyens/hudson/goals.txt 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,96 @@ +################## +### jbpm4-base ### +################## + +goal: +----- +* watch over the smoke tests that all developers should do before checking in +* should run every hour if there was svn commits + +script: +------- +mvn clean install + +configuration: +-------------- +* direct db access +* hsqldb in memory + + +#################### +### jbpm4-distro ### +#################### + +goal: +----- +build the distribution for the other hudson jobs + +script: +------- +mvn -Pdistro clean install + + +################### +### jbpm4-jboss ### +################### + +goal: +----- +QA for SOA-platform +release criterium. + + +depends: +-------- +job jbpm-distro + +axis: +----- +DATABASE {mysql, oracle, postgresql} x JBOSS_VERSION {5.0.0.GA} + +script: +------- +get distro from repository +unzip jbpm distro +create jBPM schema +overwrite ${jbpm.home}/jboss/build.properties (includes database property) +ant -f ${jbpm.home}/jboss/build.xml reinstall.jboss +ant -f ${jbpm.home}/jboss/build.xml start.jboss +mvn -Djboss.bind.address=localhost clean install (should only execute tests for examples and test-db) +stop jboss +drop jBPM schema + + +client configuration: +--------------------- +* remote ejb command service + +server configuration: +--------------------- +* jmx interceptor command service + + + +################ +### jbpm4-db ### +################ + +depends: +-------- +job jbpm-distro + +axis: +----- +DATABASE + +script: +------- +get jbpm distro from repository +unzip jbpm distro +create jBPM schema +mvn -Ddatabase=${database} clean install +drop jBPM schema + +configuration: +-------------- +* direct db access \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/hudson/goals.txt ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/hudson/jboss/build.xml =================================================================== --- jbpm4/branches/tbaeyens/hudson/jboss/build.xml (rev 0) +++ jbpm4/branches/tbaeyens/hudson/jboss/build.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jbpm.jboss.install"> + + <property file="build.properties" /> + + <property name="jboss.version" value="5.0.0.GA" /> + <property name="jboss.distro" value="C:/Downloads/jboss/jboss-${jboss.version}.zip" /> + <property name="jboss.home" value="C:/Software/jboss-${jboss.version}" /> + + <target name="clean.install" + depends="delete.jboss.installation, install.jboss, install.jbpm" + description="re-installs jboss and then installs jbpm in there" /> + + <target name="delete.jboss.installation"> + <delete dir="${jboss.home}" /> + </target> + + <target name="install.jboss"> + <unzip src="${jboss.distro}" dest="${jboss.home}/.." /> + </target> + + <target name="install.jbpm"> + <copy todir="${jboss.home}"> + <fileset dir="C:/Software/jbpm-4.0.0-before/jboss-5.0.0.GA" /> + </copy> + </target> + +</project> Property changes on: jbpm4/branches/tbaeyens/hudson/jboss/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/Deployment.java =================================================================== --- jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/Deployment.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/Deployment.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -21,6 +21,7 @@ */ package org.jbpm.api; +import java.io.File; import java.io.InputStream; import java.net.URL; import java.util.zip.ZipInputStream; @@ -43,6 +44,7 @@ Deployment addResourceFromClasspath(String resourceName); Deployment addResourceFromUrl(URL url); Deployment addResourcesFromZipInputStream(ZipInputStream zipInputStream); + Deployment addResourceFromFile(File file); /** @return deploymentId */ long deploy(); Modified: jbpm4/branches/tbaeyens/modules/examples/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/pom.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/pom.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -29,6 +29,7 @@ <!-- Dependencies --> <dependencies> + <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-api</artifactId> Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -2,67 +2,8 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine-context> - - <repository-service /> - <repository-cache /> - <execution-service /> - <history-service /> - <management-service /> - <task-service /> - <identity-service /> - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration> - <cfg resource="jbpm.hibernate.cfg.xml" /> - </hibernate-configuration> + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.deployermgr.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> - <hibernate-session-factory /> - - <deployer-manager> - <jpdl-deployer /> - </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="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - - <authentication /> - - <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> - <repository-session /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - <history-session /> - <transaction /> - <hibernate-session /> - <identity-session /> - </transaction-context> - </jbpm-configuration> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,358 +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 package="org.jbpm.pvm.internal.model" default-access="field"> - - <!-- ### TYPEDEFS ####################################################### --> - <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> - <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> - <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> - <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> - <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> - <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> - <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> - </typedef> - - <!-- ### PROCESS DEFINITION ############################################# --> - <class name="ExecutionImpl" - table="JBPM_EXECUTION" - discriminator-value="pvm"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="activityName" column="ACTIVITYNAME_" /> - <property name="processDefinitionId" column="PROCDEFID_" /> - - <property name="hasVariables" column="HASVARS_" /> - <map name="variables" - cascade="all-delete-orphan"> - <key foreign-key="FK_VAR_EXECUTION"> - <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> - </key> - <map-key type="string" column="KEY_" /> - <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> - </map> - - <property name="hasTimers" column="HASTIMERS_" /> - <set name="timers" - cascade="all-delete-orphan"> - <key foreign-key="FK_TMR_EXECUTION"> - <column name="EXECUTION_" /> - </key> - <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> - </set> - - <property name="name" column="NAME_" /> - <property name="key" column="KEY_" /> - <property name="id" column="ID_" unique="true" /> - - <property name="state" column="STATE_" /> - - <property name="priority" column="PRIORITY_" /> - <property name="historyActivityInstanceDbid" column="HISACTINST_" /> - - <!-- many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" / --> - - <!-- many-to-one name="transitionOrigin" - class="org.jbpm.pvm.internal.model.ActivityImpl" - column="TRANSORIG_" - foreign-key="FK_EXEC_TRANSORIG" - index="IDX_EXEC_TRANSORIG" / --> - - <list name="executions" - cascade="all-delete-orphan" - inverse="false" - lazy="false"> - <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="ExecutionImpl" /> - </list> - - <many-to-one name="parent" - column="PARENT_" - class="ExecutionImpl" - foreign-key="FK_EXEC_PARENT" - index="IDX_EXEC_PARENT" /> - - <many-to-one name="processInstance" - class="ExecutionImpl" - column="INSTANCE_" - foreign-key="FK_EXEC_INSTANCE" - index="IDX_EXEC_INSTANCE" /> - - <many-to-one name="superProcessExecution" - column="SUPEREXEC_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUPEREXEC" - index="IDX_EXEC_SUPEREXEC" /> - - <many-to-one name="subProcessInstance" - column="SUBPROCINST_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUBPI" - index="IDX_EXEC_SUBPI" /> - - </class> - - <!-- ### COMMENTS ####################################################### --> - <class name="CommentImpl" table="JBPM_COMMENT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="userId" column="USERID_" /> - <property name="time" column="TIME_" /> - <property name="message" column="MESSAGE_" /> - - <list name="comments" - cascade="all-delete-orphan" - inverse="false"> - <key column="PARENT_" foreign-key="none" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="CommentImpl" /> - </list> - </class> - - <!-- ### VARIABLE ####################################################### --> - <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> - <!-- discriminator values: - date : org.jbpm.pvm.internal.type.variable.DateVariable - double : org.jbpm.pvm.internal.type.variable.DoubleVariable - hibl : org.jbpm.pvm.internal.type.variable.HibernateLongVariable - long : org.jbpm.pvm.internal.type.variable.LongVariable - hibs : org.jbpm.pvm.internal.type.variable.HibernateStringVariable - string : org.jbpm.pvm.internal.type.variable.StringVariable - null : org.jbpm.pvm.internal.type.variable.NullVariable - blob : org.jbpm.pvm.internal.type.variable.BlobVariable - clob : org.jbpm.pvm.internal.type.variable.ClobVariable - --> - - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="key" column="KEY_"/> - <property name="queryText" column="QUERYTEXT_" /> - <property name="converter" type="converter" column="CONVERTER_" /> - <many-to-one name="processInstance" - column="PROCINST_" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - foreign-key="FK_VAR_PROCINST" - index="IDX_VAR_PROCINST"/> - </class> - - <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> - <property name="date" column="DATE_VALUE_" type="timestamp"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> - <property name="d" column="DOUBLE_VALUE_" type="double"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> - <property name="hibernatable" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> - <property name="l" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> - <property name="hibernatable" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> - <property name="string" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="FK_VAR_LOB" - index="IDX_VAR_LOB" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="none"/> - </subclass> - - <!-- ### LOB ############################################################ --> - <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> - <property name="bytes" type="binary" column="BINARY_VALUE_"/> - <property name="clob" type="clob" column="CLOB_VALUE_" /> - <property name="text" type="text" column="TEXT_VALUE_"/> - </class> - - <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> - <property name="isSuspended" column="ISSUSPENDED_" /> - <property name="isExclusive" column="ISEXCLUSIVE_" /> - <property name="lockOwner" column="LOCKOWNER_" /> - <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> - <property name="info" column="INFO_" /> - <property name="exception" column="EXCEPTION_" type="text" /> - <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCESSINSTANCE_" - cascade="none" - foreign-key="FK_JOB_PRINST" - index="IDX_JOB_PRINST"/> - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - cascade="none" - foreign-key="FK_JOB_EXE" - index="IDX_JOB_EXE"/> - - <!-- many-to-one name="commandDescriptor" - column="CMDDESCR_" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - cascade="all" - foreign-key="FK_JOB_CMDDESCR" - index="IDX_JOB_CMDDESCR"/ --> - - <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> - <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> - <property name="signalName" column="SIGNAL_" /> - <!-- many-to-one name="activity" - column="NODE_" - cascade="none" - foreign-key="FK_JOB_NODE"/ --> - </subclass> - <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> - <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> - <property name="signalName" column="SIGNAL_" /> - <property name="eventName" column="EVENT_" /> - <property name="repeat" column="REPEAT_" /> - </subclass> - - </class> - - <!-- ### HibernatePvmDbSession QUERIES ################################## --> - - <query name="findTimers"> - <![CDATA[ - select t - from org.jbpm.pvm.internal.job.TimerImpl as t - order by dueDate asc - ]]> - </query> - - <query name="findMessages"> - <![CDATA[ - select m - from org.jbpm.pvm.internal.job.MessageImpl as m - ]]> - </query> - - <query name="findJobsWithException"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.retries = 0 - order by dueDate asc - ]]> - </query> - - <!-- ### HibernateJobDbSession QUERIES ################################## --> - <query name="findFirstAcquirableJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where ( ( (job.lockExpirationTime is null) - or (job.lockExpirationTime <= :now) - ) - and - ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - and - ( job.retries > 0 ) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findExclusiveJobs"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.processInstance = :processInstance - and job.isExclusive = true - and job.retries > 0 - and ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findFirstDueJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.retries > 0 - order by job.dueDate asc - ]]> - </query> - - <!-- ### HibernatePvmDbSession QUERIES ############################################# --> - <query name="findExecutionById"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.id = :id - ]]> - </query> - - <query name="findProcessInstanceById"> - <![CDATA[ - select processInstance - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.id = :processInstanceId - and processInstance.parent is null - ]]> - </query> - -</hibernate-mapping> \ No newline at end of file Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -6,20 +6,21 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.format_sql">true</property> - <property name="hibernate.cache.use_second_level_cache">true</property> - <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + </session-factory> </hibernate-configuration> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.history.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.history.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,75 +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 package="org.jbpm.pvm.internal.history.model" default-access="field"> - - <!-- ### HISTORY PROCESS INSTANCE ####################################### --> - <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> - <id name="processInstanceId" column="ID_"> - <generator class="assigned" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="processDefinitionId" column="PROCDEFID_" /> - <property name="key" column="KEY_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="state" column="STATE_" /> - <property name="endActivityName" column="ENDACTIVITY_" /> - - <!-- many-to-one name="processDefinition" - class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" - column="PROCDEF_" - foreign-key="FK_HISTPI_PROCDEF" - index="IDX_HISTPI_PROCDEF" / --> - - <set name="historyActivityInstances" - cascade="all"> - <key> - <column name="HPI_" /> - </key> - <one-to-many class="HistoryActivityInstanceImpl" /> - </set> - - </class> - - <!-- ### HISTORY PROCESS INSTANCE ####################################### --> - <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="historyProcessInstance" - class="HistoryProcessInstanceImpl" - column="HPI_" - foreign-key="FK_HAI_HPI" - index="IDX_HAI_HPI" /> - - <!-- many-to-one name="activity" - class="org.jbpm.pvm.internal.model.ActivityImpl" - column="ACTIVITY_" - foreign-key="FK_HISTAI_ACT" - index="IDX_HISTAI_ACT" / --> - - <property name="type" column="TYPE_" /> - <property name="executionId" column="EXECUTION_" /> - <property name="activityName" column="ACTIVITY_NAME_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="transitionName" column="TRANSITION_" /> - - <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> - <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> - </subclass> - - <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> - <property name="assignee" column="ASSIGNEE_" /> - <property name="state" column="STATE_" /> - </subclass> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,59 +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 package="org.jbpm.pvm.internal.identity.impl" default-access="field"> - - <!-- ### USER ########################################################### --> - <class name="UserImpl" table="JBPM_ID_USER"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="password" column="PASSWORD_" /> - <property name="givenName" column="GIVENNAME_" /> - <property name="familyName" column="FAMILYNAME_" /> - </class> - - <!-- ### MEMBERSHIP ##################################################### --> - <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="user" - column="USER_" - class="UserImpl" - foreign-key="FK_MEM_USER" - index="IDX_MEM_USER"/> - - <many-to-one name="group" - column="GROUP_" - class="GroupImpl" - foreign-key="FK_MEM_GROUP" - index="IDX_MEM_GROUP"/> - - <property name="role" column="NAME_" /> - </class> - - <!-- ### GROUP ########################################################### --> - <class name="GroupImpl" table="JBPM_ID_GROUP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="name" column="NAME_" /> - <property name="type" column="TYPE_" /> - - <many-to-one name="parent" - column="PARENT_" - class="GroupImpl" - foreign-key="FK_GROUP_PARENT" - index="IDX_GROUP_PARENT"/> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.activities.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.activities.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,17 +0,0 @@ -<activities> - <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> -</activities> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.eventlisteners.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,8 +0,0 @@ -<eventlisteners> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> -</eventlisteners> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,123 +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 default-access="field"> - - <!-- subclass name="org.jbpm.jpdl.internal.model.JpdlProcessDefinition" - extends="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" - discriminator-value="jpdl"> - <map name="swimlaneDefinitions" - cascade="all-delete-orphan"> - <key foreign-key="FK_SWLDEF_PROCESS"> - <column name="PROCESS_SWL_" index="IDX_SWLDEF_PROCESS"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneDefinitionImpl" /> - </map> - <map name="taskDefinitions" - cascade="all-delete-orphan"> - <key foreign-key="FK_TSKDEF_PROCESS"> - <column name="PROCESS_" index="IDX_TSKDEF_PROCESS"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.TaskDefinitionImpl" /> - </map> - </subclass --> - - <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" - extends="org.jbpm.pvm.internal.model.ExecutionImpl" - discriminator-value="jpdl"> - - <map name="swimlanes" - cascade="all-delete-orphan"> - <key foreign-key="FK_SWIMLANE_EXEC"> - <column name="EXECUTION_" index="IDX_SWIMLANE_EXEC"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneImpl" /> - </map> - </subclass> - - <!-- class name="org.jbpm.jpdl.internal.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY" abstract="true" discriminator-value="X"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <subclass name="org.jbpm.jpdl.internal.activity.StartActivity" discriminator-value="start" /> - <subclass name="org.jbpm.jpdl.internal.activity.DecisionConditionActivity" discriminator-value="excl-cond" /> - <subclass name="org.jbpm.jpdl.internal.activity.DecisionExpressionActivity" discriminator-value="excl-expr"> - <property name="expr" column="TEXT_" /> - <property name="lang" column="TEXT2_" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.DecisionHandlerActivity" discriminator-value="excl-handler"> - <property name="decisionHandlerName" column="TEXT_" /> - <many-to-one name="decisionHandlerDescriptor" - column="EXCLDESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - foreign-key="FK_ACT_EXCLDESCR" - index="IDX_ACT_EXCLDESCR" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.StateActivity" discriminator-value="state" /> - <subclass name="org.jbpm.jpdl.internal.activity.EndActivity" discriminator-value="end"> - <property name="endProcessInstance" column="ENDPI_" /> - <property name="state" column="TEXT_" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.ForkActivity" discriminator-value="fork" /> - <subclass name="org.jbpm.jpdl.internal.activity.JoinActivity" discriminator-value="join" /> - <subclass name="org.jbpm.jpdl.internal.activity.HqlActivity" discriminator-value="hql"> - <property name="query" column="TEXT_" /> - <property name="resultVariableName" column="TEXT2_" /> - <property name="isResultUnique" column="ISUNIQ_" /> - <many-to-one name="parametersDescriptor" - column="PARAMDESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.ListDescriptor" - foreign-key="FK_ACT_PARAMDESCR" - index="IDX_ACT_PARAMDESCR" /> - - <subclass name="org.jbpm.jpdl.internal.activity.SqlActivity" discriminator-value="sql" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.JavaActivity" discriminator-value="java"> - <property name="methodName" column="TEXT_" /> - <property name="variableName" column="TEXT2_" /> - <many-to-one name="descriptor" - column="JAVADESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - foreign-key="FK_ACT_JAVADESCR" - index="IDX_ACT_JAVADESCR" /> - <many-to-one name="invokeOperation" - column="INVOPER_" - cascade="all" - class="org.jbpm.pvm.internal.wire.operation.InvokeOperation" - foreign-key="FK_ACT_INVKOPER" - index="IDX_ACT_INVKOPER" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.ScriptActivity" discriminator-value="script"> - <property name="script" column="TEXT_" /> - <property name="language" column="TEXT2_" /> - <property name="variableName" column="TEXT3_" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.EsbActivity" discriminator-value="esb"> - <property name="service" column="TEXT_" /> - <property name="category" column="TEXT2_" /> - <many-to-one name="partsListDescriptor" - column="PARTSDESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.ListDescriptor" - foreign-key="FK_ACT_PARTSDESCR" - index="IDX_ACT_PARTSDESCR" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.TaskActivity" discriminator-value="task"> - <many-to-one name="taskDefinition" - column="TASKDEF_" - cascade="all" - class="org.jbpm.pvm.internal.task.TaskDefinitionImpl" - foreign-key="FK_ACT_TASKDEF" - index="IDX_ACT_TASKDEF" /> - </subclass> - </class> - --> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.repository.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.repository.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.repository.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,50 +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 default-access="field"> - - <!-- ### Deployment ##################################################### --> - <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" - table="JBPM_DEPLOYMENT"> - - <!-- ProcessElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - - <property name="name" type="text" column="NAME_" /> - <property name="timestamp" column="TIMESTAMP_" /> - - <map name="resources" cascade="all-delete-orphan"> - <key foreign-key="FK_LOB_DEPLOYMENT"> - <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> - </key> - <map-key type="text" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> - </map> - - <set name="objectProperties" - table="JBPM_DEPLOYPROPS" - cascade="all"> - <key column="DEPLOYMENT_" /> - <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> - </set> - - </class> - - <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <many-to-one name="deployment" - class="org.jbpm.pvm.internal.repository.DeploymentImpl" - column="DEPLOYMENT_" - foreign-key="FK_DEPLPROP_DEPL" - index="IDX_DEPLPROP_DEPL" /> - <property name="objectName" column="OBJNAME_" /> - <property name="key" column="KEY_" /> - <property name="stringValue" column="STRINGVAL_" /> - <property name="longValue" column="LONGVAL_" /> - </class> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,197 +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.pvm.internal.task" default-access="field"> - - <!-- ### ASSIGNABLE DEFINITIONS ######################################### - <class name="AssignableDefinitionImpl" - table="JBPM_ASSIGNDEF" - discriminator-value="A" > - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assigneeExpression" column="ASS_EXPR_"/> - <property name="assigneeExpressionLanguage" column="ASS_EXPR_LANG_"/> - <property name="candidateUsersExpression" column="CNDUSR_EXPR_"/> - <property name="candidateUsersExpressionLanguage" column="CNDUSR_EXPRLANG_"/> - <property name="candidateGroupsExpression" column="CNDGRP_EXPR_"/> - <property name="candidateGroupsExpressionLanguage" column="CNDGRP_EXPRLANG_"/> - - <many-to-one name="assignmentHandlerDescriptor" - column="ASSHNDLR_DESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - foreign-key="FK_ASSHNDLR_DESCR" - index="IDX_ASSHNDLR_DESCR" /> - - <subclass name="SwimlaneDefinitionImpl" discriminator-value="S"> - </subclass> - --> - - <!-- ### TASK DEFINITION ################################################ - <subclass name="TaskDefinitionImpl" discriminator-value="T"> - - <property name="priority" column="PRIORITY_"/> - <property name="dueDateDuration" column="DUEDATE_"/> - - <many-to-one name="taskHandlerDescriptor" - column="TSKHNDLRDESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - foreign-key="FK_TSKHNDLR_DESCR" - index="IDX_TSKHNDLR_DESCR" /> - - <many-to-one name="swimlaneDefinition" - column="SWIMLDEF_" - cascade="all" - class="SwimlaneDefinitionImpl" - foreign-key="FK_TSK_SWIMLDEF" - index="IDX_TSK_SWIMLDEF" /> - - <list name="subTaskDefinitions" cascade="all-delete-orphan"> - <key column="TASKDEF_" /> - <list-index column="TASKDEF_IDX_" /> - <one-to-many class="TaskDefinitionImpl" /> - </list> - </subclass> - </class> - --> - - <!-- ### TASK ########################################################### --> - <class name="TaskImpl" - table="JBPM_TASK" - discriminator-value="T"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator type="char" column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" unique="true" /> - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assignee" column="ASSIGNEE_"/> - - <set name="participations" cascade="all-delete-orphan"> - <key column="TASK_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - <property name="priority" column="PRIORITY_"/> - <property name="create" column="CREATE_"/> - <property name="dueDate" column="DUEDATE_"/> - <property name="progress" column="PROGRESS_"/> - <property name="isSignalling" column="SIGNALLING_"/> - - <!-- - <many-to-one name="variableMap" - class="org.jbpm.pvm.impl.VariableMap" - column="VARMAP_" - foreign-key="FK_TASK_VARMAP" - cascade="all" /> - --> - - <many-to-one name="superTask" - class="TaskImpl" - column="SUPERTASK_" - foreign-key="FK_TASK_SUPERTASK" - index="IDX_TASK_SUPERTASK" /> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCINST_" - foreign-key="none" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_TASK_SWIML" /> - - <property name="taskDefinitionName" column="TASKDEFNAME_"/> - - <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_" /> - <one-to-many class="TaskImpl" /> - </set> - - </class> - - <!-- ### PARTICIPANT #################################################### --> - <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="groupId" column="GROUPID_"/> - <property name="userId" column="USERID_"/> - <property name="type" column="TYPE_" /> - - <many-to-one name="task" - class="TaskImpl" - column="TASK_" - index="IDX_PART_TASK" - foreign-key="FK_PART_TASK" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_PART_SWIMLANE" /> - - </class> - - <!-- ### SWIMLANE ####################################################### --> - <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> - <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" / --> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <set name="participations" cascade="all-delete-orphan"> - <key column="SWIMLANE_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - </class> - - - <!-- ### QUERIES ######################################################## --> - - <query name="findTasks"> - <![CDATA[ - select task - from org.jbpm.pvm.internal.task.TaskImpl as task - ]]> - </query> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.lifecycle.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.lifecycle.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.lifecycle.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,13 +0,0 @@ -<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> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.variable.types.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.variable.types.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.variable.types.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,34 +0,0 @@ -<types> - - <!-- types stored in a native column --> - <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - - <!-- types converted to a string --> - <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - - <!-- types converted to a long --> - <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - - <!-- types converted to a double --> - <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - - <!-- byte[] and char[] --> - <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> - - <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> - <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> - - <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - - <!-- TODO: add ejb3 entity bean support --> - <!-- TODO: add JCR activity support --> - <!-- TODO: add collection support --> - -</types> Deleted: 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-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,95 +0,0 @@ -<wire-bindings> - - <!-- ########################### --> - <!-- ### Descriptor bindings ### --> - <!-- ########################### --> - <!-- basic types --> - <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> - <!-- object and ref --> - <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> - <!-- collections --> - <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> - <!-- environment refs --> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentFactoryRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> - <!-- various specials --> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> - <!-- hibernate bindings --> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> - <!-- sessions --> - <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> - - <!-- db sessions --> - <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> - - <!-- dynamic type mapping configuration --> - <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> - <!-- services --> - <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> - - <!-- deployers --> - <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> - - <!-- interceptors --> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> - <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.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.JpdlDeployerBinding" /> - -</wire-bindings> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jndi.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jndi.properties 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jndi.properties 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,3 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -java.naming.provider.url=jnp\://${jboss.bind.address}\:1099 Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/logging.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/logging.properties 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/logging.properties 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,10 +1,10 @@ handlers= java.util.logging.ConsoleHandler redirect.commons.logging = enabled -java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.level = FINEST java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter -org.jbpm.level=FINE +org.jbpm.level=FINEST # org.jbpm.pvm.internal.tx.level=FINE # org.jbpm.pvm.internal.wire.level=FINE # org.jbpm.pvm.internal.util.level=FINE Added: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + + <deployer-manager> + <jpdl-deployer /> + </deployer-manager> + + </process-engine-context> + +</jbpm-configuration> Property changes on: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.activities.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,17 @@ +<activities> + <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> +</activities> Property changes on: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.eventlisteners.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,8 @@ +<eventlisteners> + <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> +</eventlisteners> Property changes on: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,123 @@ +<?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 default-access="field"> + + <!-- subclass name="org.jbpm.jpdl.internal.model.JpdlProcessDefinition" + extends="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" + discriminator-value="jpdl"> + <map name="swimlaneDefinitions" + cascade="all-delete-orphan"> + <key foreign-key="FK_SWLDEF_PROCESS"> + <column name="PROCESS_SWL_" index="IDX_SWLDEF_PROCESS"/> + </key> + <map-key type="string" column="NAME_" /> + <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneDefinitionImpl" /> + </map> + <map name="taskDefinitions" + cascade="all-delete-orphan"> + <key foreign-key="FK_TSKDEF_PROCESS"> + <column name="PROCESS_" index="IDX_TSKDEF_PROCESS"/> + </key> + <map-key type="string" column="NAME_" /> + <one-to-many class="org.jbpm.pvm.internal.task.TaskDefinitionImpl" /> + </map> + </subclass --> + + <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" + extends="org.jbpm.pvm.internal.model.ExecutionImpl" + discriminator-value="jpdl"> + + <map name="swimlanes" + cascade="all-delete-orphan"> + <key foreign-key="FK_SWIMLANE_EXEC"> + <column name="EXECUTION_" index="IDX_SWIMLANE_EXEC"/> + </key> + <map-key type="string" column="NAME_" /> + <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneImpl" /> + </map> + </subclass> + + <!-- class name="org.jbpm.jpdl.internal.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY" abstract="true" discriminator-value="X"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_" /> + <subclass name="org.jbpm.jpdl.internal.activity.StartActivity" discriminator-value="start" /> + <subclass name="org.jbpm.jpdl.internal.activity.DecisionConditionActivity" discriminator-value="excl-cond" /> + <subclass name="org.jbpm.jpdl.internal.activity.DecisionExpressionActivity" discriminator-value="excl-expr"> + <property name="expr" column="TEXT_" /> + <property name="lang" column="TEXT2_" /> + </subclass> + <subclass name="org.jbpm.jpdl.internal.activity.DecisionHandlerActivity" discriminator-value="excl-handler"> + <property name="decisionHandlerName" column="TEXT_" /> + <many-to-one name="decisionHandlerDescriptor" + column="EXCLDESCR_" + cascade="all" + class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" + foreign-key="FK_ACT_EXCLDESCR" + index="IDX_ACT_EXCLDESCR" /> + </subclass> + <subclass name="org.jbpm.jpdl.internal.activity.StateActivity" discriminator-value="state" /> + <subclass name="org.jbpm.jpdl.internal.activity.EndActivity" discriminator-value="end"> + <property name="endProcessInstance" column="ENDPI_" /> + <property name="state" column="TEXT_" /> + </subclass> + <subclass name="org.jbpm.jpdl.internal.activity.ForkActivity" discriminator-value="fork" /> + <subclass name="org.jbpm.jpdl.internal.activity.JoinActivity" discriminator-value="join" /> + <subclass name="org.jbpm.jpdl.internal.activity.HqlActivity" discriminator-value="hql"> + <property name="query" column="TEXT_" /> + <property name="resultVariableName" column="TEXT2_" /> + <property name="isResultUnique" column="ISUNIQ_" /> + <many-to-one name="parametersDescriptor" + column="PARAMDESCR_" + cascade="all" + class="org.jbpm.pvm.internal.wire.descriptor.ListDescriptor" + foreign-key="FK_ACT_PARAMDESCR" + index="IDX_ACT_PARAMDESCR" /> + + <subclass name="org.jbpm.jpdl.internal.activity.SqlActivity" discriminator-value="sql" /> + </subclass> + <subclass name="org.jbpm.jpdl.internal.activity.JavaActivity" discriminator-value="java"> + <property name="methodName" column="TEXT_" /> + <property name="variableName" column="TEXT2_" /> + <many-to-one name="descriptor" + column="JAVADESCR_" + cascade="all" + class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" + foreign-key="FK_ACT_JAVADESCR" + index="IDX_ACT_JAVADESCR" /> + <many-to-one name="invokeOperation" + column="INVOPER_" + cascade="all" + class="org.jbpm.pvm.internal.wire.operation.InvokeOperation" + foreign-key="FK_ACT_INVKOPER" + index="IDX_ACT_INVKOPER" /> + </subclass> + <subclass name="org.jbpm.jpdl.internal.activity.ScriptActivity" discriminator-value="script"> + <property name="script" column="TEXT_" /> + <property name="language" column="TEXT2_" /> + <property name="variableName" column="TEXT3_" /> + </subclass> + <subclass name="org.jbpm.jpdl.internal.activity.EsbActivity" discriminator-value="esb"> + <property name="service" column="TEXT_" /> + <property name="category" column="TEXT2_" /> + <many-to-one name="partsListDescriptor" + column="PARTSDESCR_" + cascade="all" + class="org.jbpm.pvm.internal.wire.descriptor.ListDescriptor" + foreign-key="FK_ACT_PARTSDESCR" + index="IDX_ACT_PARTSDESCR" /> + </subclass> + <subclass name="org.jbpm.jpdl.internal.activity.TaskActivity" discriminator-value="task"> + <many-to-one name="taskDefinition" + column="TASKDEF_" + cascade="all" + class="org.jbpm.pvm.internal.task.TaskDefinitionImpl" + foreign-key="FK_ACT_TASKDEF" + index="IDX_ACT_TASKDEF" /> + </subclass> + </class> + --> + +</hibernate-mapping> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -2,67 +2,8 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine-context> - - <repository-service /> - <repository-cache /> - <execution-service /> - <history-service /> - <management-service /> - <task-service /> - <identity-service /> - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration> - <cfg resource="jbpm.hibernate.cfg.xml" /> - </hibernate-configuration> + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.deployermgr.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> - <hibernate-session-factory /> - - <deployer-manager> - <jpdl-deployer /> - </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="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - - <authentication /> - - <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> - <repository-session /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - <history-session /> - <transaction /> - <hibernate-session /> - <identity-session /> - </transaction-context> - </jbpm-configuration> Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,358 +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 package="org.jbpm.pvm.internal.model" default-access="field"> - - <!-- ### TYPEDEFS ####################################################### --> - <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> - <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> - <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> - <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> - <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> - <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> - <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> - </typedef> - - <!-- ### PROCESS DEFINITION ############################################# --> - <class name="ExecutionImpl" - table="JBPM_EXECUTION" - discriminator-value="pvm"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="activityName" column="ACTIVITYNAME_" /> - <property name="processDefinitionId" column="PROCDEFID_" /> - - <property name="hasVariables" column="HASVARS_" /> - <map name="variables" - cascade="all-delete-orphan"> - <key foreign-key="FK_VAR_EXECUTION"> - <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> - </key> - <map-key type="string" column="KEY_" /> - <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> - </map> - - <property name="hasTimers" column="HASTIMERS_" /> - <set name="timers" - cascade="all-delete-orphan"> - <key foreign-key="FK_TMR_EXECUTION"> - <column name="EXECUTION_" /> - </key> - <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> - </set> - - <property name="name" column="NAME_" /> - <property name="key" column="KEY_" /> - <property name="id" column="ID_" unique="true" /> - - <property name="state" column="STATE_" /> - - <property name="priority" column="PRIORITY_" /> - <property name="historyActivityInstanceDbid" column="HISACTINST_" /> - - <!-- many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" / --> - - <!-- many-to-one name="transitionOrigin" - class="org.jbpm.pvm.internal.model.ActivityImpl" - column="TRANSORIG_" - foreign-key="FK_EXEC_TRANSORIG" - index="IDX_EXEC_TRANSORIG" / --> - - <list name="executions" - cascade="all-delete-orphan" - inverse="false" - lazy="false"> - <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="ExecutionImpl" /> - </list> - - <many-to-one name="parent" - column="PARENT_" - class="ExecutionImpl" - foreign-key="FK_EXEC_PARENT" - index="IDX_EXEC_PARENT" /> - - <many-to-one name="processInstance" - class="ExecutionImpl" - column="INSTANCE_" - foreign-key="FK_EXEC_INSTANCE" - index="IDX_EXEC_INSTANCE" /> - - <many-to-one name="superProcessExecution" - column="SUPEREXEC_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUPEREXEC" - index="IDX_EXEC_SUPEREXEC" /> - - <many-to-one name="subProcessInstance" - column="SUBPROCINST_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUBPI" - index="IDX_EXEC_SUBPI" /> - - </class> - - <!-- ### COMMENTS ####################################################### --> - <class name="CommentImpl" table="JBPM_COMMENT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="userId" column="USERID_" /> - <property name="time" column="TIME_" /> - <property name="message" column="MESSAGE_" /> - - <list name="comments" - cascade="all-delete-orphan" - inverse="false"> - <key column="PARENT_" foreign-key="none" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="CommentImpl" /> - </list> - </class> - - <!-- ### VARIABLE ####################################################### --> - <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> - <!-- discriminator values: - date : org.jbpm.pvm.internal.type.variable.DateVariable - double : org.jbpm.pvm.internal.type.variable.DoubleVariable - hibl : org.jbpm.pvm.internal.type.variable.HibernateLongVariable - long : org.jbpm.pvm.internal.type.variable.LongVariable - hibs : org.jbpm.pvm.internal.type.variable.HibernateStringVariable - string : org.jbpm.pvm.internal.type.variable.StringVariable - null : org.jbpm.pvm.internal.type.variable.NullVariable - blob : org.jbpm.pvm.internal.type.variable.BlobVariable - clob : org.jbpm.pvm.internal.type.variable.ClobVariable - --> - - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="key" column="KEY_"/> - <property name="queryText" column="QUERYTEXT_" /> - <property name="converter" type="converter" column="CONVERTER_" /> - <many-to-one name="processInstance" - column="PROCINST_" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - foreign-key="FK_VAR_PROCINST" - index="IDX_VAR_PROCINST"/> - </class> - - <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> - <property name="date" column="DATE_VALUE_" type="timestamp"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> - <property name="d" column="DOUBLE_VALUE_" type="double"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> - <property name="hibernatable" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> - <property name="l" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> - <property name="hibernatable" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> - <property name="string" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="FK_VAR_LOB" - index="IDX_VAR_LOB" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="none"/> - </subclass> - - <!-- ### LOB ############################################################ --> - <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> - <property name="bytes" type="binary" column="BINARY_VALUE_"/> - <property name="clob" type="clob" column="CLOB_VALUE_" /> - <property name="text" type="text" column="TEXT_VALUE_"/> - </class> - - <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> - <property name="isSuspended" column="ISSUSPENDED_" /> - <property name="isExclusive" column="ISEXCLUSIVE_" /> - <property name="lockOwner" column="LOCKOWNER_" /> - <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> - <property name="info" column="INFO_" /> - <property name="exception" column="EXCEPTION_" type="text" /> - <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCESSINSTANCE_" - cascade="none" - foreign-key="FK_JOB_PRINST" - index="IDX_JOB_PRINST"/> - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - cascade="none" - foreign-key="FK_JOB_EXE" - index="IDX_JOB_EXE"/> - - <!-- many-to-one name="commandDescriptor" - column="CMDDESCR_" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - cascade="all" - foreign-key="FK_JOB_CMDDESCR" - index="IDX_JOB_CMDDESCR"/ --> - - <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> - <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> - <property name="signalName" column="SIGNAL_" /> - <!-- many-to-one name="activity" - column="NODE_" - cascade="none" - foreign-key="FK_JOB_NODE"/ --> - </subclass> - <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> - <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> - <property name="signalName" column="SIGNAL_" /> - <property name="eventName" column="EVENT_" /> - <property name="repeat" column="REPEAT_" /> - </subclass> - - </class> - - <!-- ### HibernatePvmDbSession QUERIES ################################## --> - - <query name="findTimers"> - <![CDATA[ - select t - from org.jbpm.pvm.internal.job.TimerImpl as t - order by dueDate asc - ]]> - </query> - - <query name="findMessages"> - <![CDATA[ - select m - from org.jbpm.pvm.internal.job.MessageImpl as m - ]]> - </query> - - <query name="findJobsWithException"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.retries = 0 - order by dueDate asc - ]]> - </query> - - <!-- ### HibernateJobDbSession QUERIES ################################## --> - <query name="findFirstAcquirableJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where ( ( (job.lockExpirationTime is null) - or (job.lockExpirationTime <= :now) - ) - and - ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - and - ( job.retries > 0 ) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findExclusiveJobs"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.processInstance = :processInstance - and job.isExclusive = true - and job.retries > 0 - and ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findFirstDueJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.retries > 0 - order by job.dueDate asc - ]]> - </query> - - <!-- ### HibernatePvmDbSession QUERIES ############################################# --> - <query name="findExecutionById"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.id = :id - ]]> - </query> - - <query name="findProcessInstanceById"> - <![CDATA[ - select processInstance - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.id = :processInstanceId - and processInstance.parent is null - ]]> - </query> - -</hibernate-mapping> \ No newline at end of file Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -6,20 +6,21 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.format_sql">true</property> - <property name="hibernate.cache.use_second_level_cache">true</property> - <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + </session-factory> </hibernate-configuration> Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,75 +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 package="org.jbpm.pvm.internal.history.model" default-access="field"> - - <!-- ### HISTORY PROCESS INSTANCE ####################################### --> - <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> - <id name="processInstanceId" column="ID_"> - <generator class="assigned" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="processDefinitionId" column="PROCDEFID_" /> - <property name="key" column="KEY_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="state" column="STATE_" /> - <property name="endActivityName" column="ENDACTIVITY_" /> - - <!-- many-to-one name="processDefinition" - class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" - column="PROCDEF_" - foreign-key="FK_HISTPI_PROCDEF" - index="IDX_HISTPI_PROCDEF" / --> - - <set name="historyActivityInstances" - cascade="all"> - <key> - <column name="HPI_" /> - </key> - <one-to-many class="HistoryActivityInstanceImpl" /> - </set> - - </class> - - <!-- ### HISTORY PROCESS INSTANCE ####################################### --> - <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="historyProcessInstance" - class="HistoryProcessInstanceImpl" - column="HPI_" - foreign-key="FK_HAI_HPI" - index="IDX_HAI_HPI" /> - - <!-- many-to-one name="activity" - class="org.jbpm.pvm.internal.model.ActivityImpl" - column="ACTIVITY_" - foreign-key="FK_HISTAI_ACT" - index="IDX_HISTAI_ACT" / --> - - <property name="type" column="TYPE_" /> - <property name="executionId" column="EXECUTION_" /> - <property name="activityName" column="ACTIVITY_NAME_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="transitionName" column="TRANSITION_" /> - - <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> - <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> - </subclass> - - <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> - <property name="assignee" column="ASSIGNEE_" /> - <property name="state" column="STATE_" /> - </subclass> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,59 +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 package="org.jbpm.pvm.internal.identity.impl" default-access="field"> - - <!-- ### USER ########################################################### --> - <class name="UserImpl" table="JBPM_ID_USER"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="password" column="PASSWORD_" /> - <property name="givenName" column="GIVENNAME_" /> - <property name="familyName" column="FAMILYNAME_" /> - </class> - - <!-- ### MEMBERSHIP ##################################################### --> - <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="user" - column="USER_" - class="UserImpl" - foreign-key="FK_MEM_USER" - index="IDX_MEM_USER"/> - - <many-to-one name="group" - column="GROUP_" - class="GroupImpl" - foreign-key="FK_MEM_GROUP" - index="IDX_MEM_GROUP"/> - - <property name="role" column="NAME_" /> - </class> - - <!-- ### GROUP ########################################################### --> - <class name="GroupImpl" table="JBPM_ID_GROUP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="name" column="NAME_" /> - <property name="type" column="TYPE_" /> - - <many-to-one name="parent" - column="PARENT_" - class="GroupImpl" - foreign-key="FK_GROUP_PARENT" - index="IDX_GROUP_PARENT"/> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.activities.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.activities.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,17 +0,0 @@ -<activities> - <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> -</activities> Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.eventlisteners.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,8 +0,0 @@ -<eventlisteners> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> -</eventlisteners> Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,123 +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 default-access="field"> - - <!-- subclass name="org.jbpm.jpdl.internal.model.JpdlProcessDefinition" - extends="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" - discriminator-value="jpdl"> - <map name="swimlaneDefinitions" - cascade="all-delete-orphan"> - <key foreign-key="FK_SWLDEF_PROCESS"> - <column name="PROCESS_SWL_" index="IDX_SWLDEF_PROCESS"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneDefinitionImpl" /> - </map> - <map name="taskDefinitions" - cascade="all-delete-orphan"> - <key foreign-key="FK_TSKDEF_PROCESS"> - <column name="PROCESS_" index="IDX_TSKDEF_PROCESS"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.TaskDefinitionImpl" /> - </map> - </subclass --> - - <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" - extends="org.jbpm.pvm.internal.model.ExecutionImpl" - discriminator-value="jpdl"> - - <map name="swimlanes" - cascade="all-delete-orphan"> - <key foreign-key="FK_SWIMLANE_EXEC"> - <column name="EXECUTION_" index="IDX_SWIMLANE_EXEC"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneImpl" /> - </map> - </subclass> - - <!-- class name="org.jbpm.jpdl.internal.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY" abstract="true" discriminator-value="X"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <subclass name="org.jbpm.jpdl.internal.activity.StartActivity" discriminator-value="start" /> - <subclass name="org.jbpm.jpdl.internal.activity.DecisionConditionActivity" discriminator-value="excl-cond" /> - <subclass name="org.jbpm.jpdl.internal.activity.DecisionExpressionActivity" discriminator-value="excl-expr"> - <property name="expr" column="TEXT_" /> - <property name="lang" column="TEXT2_" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.DecisionHandlerActivity" discriminator-value="excl-handler"> - <property name="decisionHandlerName" column="TEXT_" /> - <many-to-one name="decisionHandlerDescriptor" - column="EXCLDESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - foreign-key="FK_ACT_EXCLDESCR" - index="IDX_ACT_EXCLDESCR" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.StateActivity" discriminator-value="state" /> - <subclass name="org.jbpm.jpdl.internal.activity.EndActivity" discriminator-value="end"> - <property name="endProcessInstance" column="ENDPI_" /> - <property name="state" column="TEXT_" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.ForkActivity" discriminator-value="fork" /> - <subclass name="org.jbpm.jpdl.internal.activity.JoinActivity" discriminator-value="join" /> - <subclass name="org.jbpm.jpdl.internal.activity.HqlActivity" discriminator-value="hql"> - <property name="query" column="TEXT_" /> - <property name="resultVariableName" column="TEXT2_" /> - <property name="isResultUnique" column="ISUNIQ_" /> - <many-to-one name="parametersDescriptor" - column="PARAMDESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.ListDescriptor" - foreign-key="FK_ACT_PARAMDESCR" - index="IDX_ACT_PARAMDESCR" /> - - <subclass name="org.jbpm.jpdl.internal.activity.SqlActivity" discriminator-value="sql" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.JavaActivity" discriminator-value="java"> - <property name="methodName" column="TEXT_" /> - <property name="variableName" column="TEXT2_" /> - <many-to-one name="descriptor" - column="JAVADESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - foreign-key="FK_ACT_JAVADESCR" - index="IDX_ACT_JAVADESCR" /> - <many-to-one name="invokeOperation" - column="INVOPER_" - cascade="all" - class="org.jbpm.pvm.internal.wire.operation.InvokeOperation" - foreign-key="FK_ACT_INVKOPER" - index="IDX_ACT_INVKOPER" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.ScriptActivity" discriminator-value="script"> - <property name="script" column="TEXT_" /> - <property name="language" column="TEXT2_" /> - <property name="variableName" column="TEXT3_" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.EsbActivity" discriminator-value="esb"> - <property name="service" column="TEXT_" /> - <property name="category" column="TEXT2_" /> - <many-to-one name="partsListDescriptor" - column="PARTSDESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.ListDescriptor" - foreign-key="FK_ACT_PARTSDESCR" - index="IDX_ACT_PARTSDESCR" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.TaskActivity" discriminator-value="task"> - <many-to-one name="taskDefinition" - column="TASKDEF_" - cascade="all" - class="org.jbpm.pvm.internal.task.TaskDefinitionImpl" - foreign-key="FK_ACT_TASKDEF" - index="IDX_ACT_TASKDEF" /> - </subclass> - </class> - --> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,50 +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 default-access="field"> - - <!-- ### Deployment ##################################################### --> - <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" - table="JBPM_DEPLOYMENT"> - - <!-- ProcessElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - - <property name="name" type="text" column="NAME_" /> - <property name="timestamp" column="TIMESTAMP_" /> - - <map name="resources" cascade="all-delete-orphan"> - <key foreign-key="FK_LOB_DEPLOYMENT"> - <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> - </key> - <map-key type="text" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> - </map> - - <set name="objectProperties" - table="JBPM_DEPLOYPROPS" - cascade="all"> - <key column="DEPLOYMENT_" /> - <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> - </set> - - </class> - - <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <many-to-one name="deployment" - class="org.jbpm.pvm.internal.repository.DeploymentImpl" - column="DEPLOYMENT_" - foreign-key="FK_DEPLPROP_DEPL" - index="IDX_DEPLPROP_DEPL" /> - <property name="objectName" column="OBJNAME_" /> - <property name="key" column="KEY_" /> - <property name="stringValue" column="STRINGVAL_" /> - <property name="longValue" column="LONGVAL_" /> - </class> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,197 +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.pvm.internal.task" default-access="field"> - - <!-- ### ASSIGNABLE DEFINITIONS ######################################### - <class name="AssignableDefinitionImpl" - table="JBPM_ASSIGNDEF" - discriminator-value="A" > - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assigneeExpression" column="ASS_EXPR_"/> - <property name="assigneeExpressionLanguage" column="ASS_EXPR_LANG_"/> - <property name="candidateUsersExpression" column="CNDUSR_EXPR_"/> - <property name="candidateUsersExpressionLanguage" column="CNDUSR_EXPRLANG_"/> - <property name="candidateGroupsExpression" column="CNDGRP_EXPR_"/> - <property name="candidateGroupsExpressionLanguage" column="CNDGRP_EXPRLANG_"/> - - <many-to-one name="assignmentHandlerDescriptor" - column="ASSHNDLR_DESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - foreign-key="FK_ASSHNDLR_DESCR" - index="IDX_ASSHNDLR_DESCR" /> - - <subclass name="SwimlaneDefinitionImpl" discriminator-value="S"> - </subclass> - --> - - <!-- ### TASK DEFINITION ################################################ - <subclass name="TaskDefinitionImpl" discriminator-value="T"> - - <property name="priority" column="PRIORITY_"/> - <property name="dueDateDuration" column="DUEDATE_"/> - - <many-to-one name="taskHandlerDescriptor" - column="TSKHNDLRDESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - foreign-key="FK_TSKHNDLR_DESCR" - index="IDX_TSKHNDLR_DESCR" /> - - <many-to-one name="swimlaneDefinition" - column="SWIMLDEF_" - cascade="all" - class="SwimlaneDefinitionImpl" - foreign-key="FK_TSK_SWIMLDEF" - index="IDX_TSK_SWIMLDEF" /> - - <list name="subTaskDefinitions" cascade="all-delete-orphan"> - <key column="TASKDEF_" /> - <list-index column="TASKDEF_IDX_" /> - <one-to-many class="TaskDefinitionImpl" /> - </list> - </subclass> - </class> - --> - - <!-- ### TASK ########################################################### --> - <class name="TaskImpl" - table="JBPM_TASK" - discriminator-value="T"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator type="char" column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" unique="true" /> - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assignee" column="ASSIGNEE_"/> - - <set name="participations" cascade="all-delete-orphan"> - <key column="TASK_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - <property name="priority" column="PRIORITY_"/> - <property name="create" column="CREATE_"/> - <property name="dueDate" column="DUEDATE_"/> - <property name="progress" column="PROGRESS_"/> - <property name="isSignalling" column="SIGNALLING_"/> - - <!-- - <many-to-one name="variableMap" - class="org.jbpm.pvm.impl.VariableMap" - column="VARMAP_" - foreign-key="FK_TASK_VARMAP" - cascade="all" /> - --> - - <many-to-one name="superTask" - class="TaskImpl" - column="SUPERTASK_" - foreign-key="FK_TASK_SUPERTASK" - index="IDX_TASK_SUPERTASK" /> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCINST_" - foreign-key="none" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_TASK_SWIML" /> - - <property name="taskDefinitionName" column="TASKDEFNAME_"/> - - <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_" /> - <one-to-many class="TaskImpl" /> - </set> - - </class> - - <!-- ### PARTICIPANT #################################################### --> - <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="groupId" column="GROUPID_"/> - <property name="userId" column="USERID_"/> - <property name="type" column="TYPE_" /> - - <many-to-one name="task" - class="TaskImpl" - column="TASK_" - index="IDX_PART_TASK" - foreign-key="FK_PART_TASK" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_PART_SWIMLANE" /> - - </class> - - <!-- ### SWIMLANE ####################################################### --> - <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> - <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" / --> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <set name="participations" cascade="all-delete-orphan"> - <key column="SWIMLANE_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - </class> - - - <!-- ### QUERIES ######################################################## --> - - <query name="findTasks"> - <![CDATA[ - select task - from org.jbpm.pvm.internal.task.TaskImpl as task - ]]> - </query> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.lifecycle.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.lifecycle.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.lifecycle.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,13 +0,0 @@ -<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> Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.variable.types.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.variable.types.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.variable.types.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,34 +0,0 @@ -<types> - - <!-- types stored in a native column --> - <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - - <!-- types converted to a string --> - <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - - <!-- types converted to a long --> - <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - - <!-- types converted to a double --> - <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - - <!-- byte[] and char[] --> - <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> - - <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> - <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> - - <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - - <!-- TODO: add ejb3 entity bean support --> - <!-- TODO: add JCR activity support --> - <!-- TODO: add collection support --> - -</types> Deleted: 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-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,95 +0,0 @@ -<wire-bindings> - - <!-- ########################### --> - <!-- ### Descriptor bindings ### --> - <!-- ########################### --> - <!-- basic types --> - <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> - <!-- object and ref --> - <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> - <!-- collections --> - <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> - <!-- environment refs --> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentFactoryRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> - <!-- various specials --> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> - <!-- hibernate bindings --> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> - <!-- sessions --> - <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> - - <!-- db sessions --> - <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> - - <!-- dynamic type mapping configuration --> - <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> - <!-- services --> - <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> - - <!-- deployers --> - <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> - - <!-- interceptors --> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> - <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.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.JpdlDeployerBinding" /> - -</wire-bindings> Modified: jbpm4/branches/tbaeyens/modules/pvm/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/pom.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/pom.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -57,6 +57,10 @@ </dependency> <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> + <dependency> <groupId>commons-email</groupId> <artifactId>commons-email</artifactId> </dependency> Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,63 @@ +/* + * 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.ant; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jbpm.api.Configuration; +import org.jbpm.api.ProcessEngine; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; + +/** + * common strategy for jbpm ant tasks to obtain a hibernate SessionFactory. + */ +public class AntHelper { + + final static Map<String, ProcessEngine> processEngines = new HashMap<String, ProcessEngine>(); + + private static final Log log = LogFactory.getLog(AntHelper.class); + + private AntHelper() { + // prevent instantiation + } + + public static ProcessEngine getProcessEnging(String jbpmCfgXml) { + ProcessEngine processEngine = (JbpmConfiguration) processEngines.get(jbpmCfgXml); + if (processEngine == null) { + Configuration configuration = new Configuration(); + if (jbpmCfgXml!=null) { + log.debug("using jbpm configuration "+jbpmCfgXml); + configuration.setResource(jbpmCfgXml); + } else { + log.debug("using default jbpm.cfg.xml configuration"); + } + + processEngine = configuration.buildProcessEngine(); + + processEngines.put(jbpmCfgXml, processEngine); + } + return processEngine; + } +} Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,115 @@ +/* + * 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.ant; + +import java.io.File; +import java.io.FileInputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.zip.ZipInputStream; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.FileSet; +import org.jbpm.api.Deployment; +import org.jbpm.api.ProcessEngine; +import org.jbpm.api.RepositoryService; + +/** + * ant task for deploying process archives. + */ +public class DeployProcessTask extends MatchingTask { + + String jbpmCfg = null; + File process = null; + List fileSets = new ArrayList(); + boolean failOnError = true; + + public void execute() throws BuildException { + // get the JbpmConfiguration + ProcessEngine processEngine = AntHelper.getProcessEnging(jbpmCfg); + + // if attribute process is set, deploy that process file + if (process!=null) { + deployProcessArchive(processEngine, process); + } + + // loop over all files that are specified in the filesets + Iterator iter = fileSets.iterator(); + while (iter.hasNext()) { + FileSet fileSet = (FileSet) iter.next(); + DirectoryScanner dirScanner = fileSet.getDirectoryScanner(getProject()); + File baseDir = dirScanner.getBasedir(); + String[] includedFiles = dirScanner.getIncludedFiles(); + List excludedFiles = Arrays.asList(dirScanner.getExcludedFiles()); + + for (int i = 0; i < includedFiles.length; i++) { + String fileName = includedFiles[i]; + if (!excludedFiles.contains(fileName)) { + File file = new File(baseDir, fileName); + deployProcessArchive(processEngine, file); + } + } + } + } + + private void deployProcessArchive(ProcessEngine processEngine, File processFile) { + RepositoryService repositoryService = processEngine.getRepositoryService(); + Deployment deployment = repositoryService.createDeployment(); + + if (processFile.getName().endsWith(".xml")) { + log("deploying process file "+processFile.getName()); + deployment.addResourceFromFile(processFile); + + } else if (processFile.getName().endsWith("ar")) { + log("deploying business archive "+processFile.getName()); + try { + FileInputStream fileInputStream = new FileInputStream(processFile); + ZipInputStream zipInputStream = new ZipInputStream(fileInputStream); + deployment.addResourcesFromZipInputStream(zipInputStream); + } catch (Exception e) { + throw new BuildException("couldn't read business archive "+processFile, e); + } + + } else { + throw new BuildException("unsupported extension: "+processFile+" Only .xml files and .*ar archives are supported"); + } + + deployment.deploy(); + } + + public void addFileset(FileSet fileSet) { + this.fileSets.add(fileSet); + } + public void setJbpmCfg(String jbpmCfg) { + this.jbpmCfg = jbpmCfg; + } + public void setProcess(File process) { + this.process = process; + } + public void setFailOnError(boolean failOnError) { + this.failOnError = failOnError; + } +} Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,59 @@ +/* + * 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.ant; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; + +public class Launcher extends Thread { + + Task task; + String command; + String endMsg; + + public Launcher(Task task, String command, String endMsg) { + this.task = task; + this.command = command; + this.endMsg = endMsg; + } + + public void run() { + try { + task.log("starting '" + command + "'..."); + Process process = Runtime.getRuntime().exec(command); + BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); + String line = ""; + while (line.indexOf(endMsg) == -1) { + line = reader.readLine(); + task.log(line); + } + task.log("'" + command + "' started."); + } catch (IOException e) { + throw new BuildException("couldn't start '" + command + "'", e); + } + } + +} Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,82 @@ +/* + * 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.ant; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; + +public class StartJBossTask extends Task { + + private static final String END_MESSAGE = " Started in "; + + String configuration = null; + String jbosshome = null; + + public void execute() throws BuildException { + try { + // get some environment variableInstances + String fileSeparator = System.getProperty( "file.separator" ); + String os = getProject().getProperty( "os.name" ).toLowerCase(); + + // build the command string + String command = null; + if ( os.indexOf( "windows" ) != -1 ) { + command = getJBossHome() + fileSeparator + "bin" + fileSeparator + "run.bat " + getConfigParameter(); + } else if ( os.indexOf( "linux" ) != -1 ) { + command = getJBossHome() + fileSeparator + "bin" + fileSeparator + "run.sh " + getConfigParameter(); + } else { + throw new BuildException( "os '" + os + "' not supported in the startjboss task." ); + } + + // launch the command and wait till the END_MESSAGE appears + Thread launcher = new Launcher(this, command, END_MESSAGE); + launcher.start(); + launcher.join(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + String getJBossHome() { + if (jbosshome!=null) { + return jbosshome; + } + String jbossHomeSysProp = getProject().getProperty( "jboss.home" ); + if (jbossHomeSysProp!=null) { + return jbossHomeSysProp; + } + throw new BuildException("startjboss couldn't figure out which jboss to start: jbosshome not specified and property jboss.home was not set"); + } + + String getConfigParameter() { + if (configuration==null) return ""; + return "-c "+configuration; + } + + public void setConfiguration(String configuration) { + this.configuration = configuration; + } + public void setJbosshome(String jbosshome) { + this.jbosshome = jbosshome; + } +} Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -33,7 +33,6 @@ import org.jbpm.api.IdentityService; import org.jbpm.api.ManagementService; import org.jbpm.api.ProcessEngine; -import org.jbpm.api.ProcessService; import org.jbpm.api.RepositoryService; import org.jbpm.api.TaskService; import org.jbpm.api.env.Context; @@ -41,8 +40,8 @@ import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.api.env.WireObject; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.JbpmConfigurationParser; import org.jbpm.pvm.internal.env.PvmEnvironment; -import org.jbpm.pvm.internal.env.JbpmConfigurationParser; import org.jbpm.pvm.internal.stream.FileStreamInput; import org.jbpm.pvm.internal.stream.InputStreamInput; import org.jbpm.pvm.internal.stream.ResourceStreamInput; @@ -87,7 +86,6 @@ private static final long serialVersionUID = 1L; private static final Log log = Log.getLog(JbpmConfiguration.class.getName()); - protected static JbpmConfigurationParser pvmEnvironmentFactoryParser = new JbpmConfigurationParser(); protected boolean isConfigured = false; protected WireContext processEngineWireContext = new WireContext(new WireDefinition(), Context.CONTEXTNAME_PROCESS_ENGINE); @@ -101,6 +99,24 @@ if (!isConfigured) { setResource("jbpm.cfg.xml"); } + log.debug("created ProcessEngine "+System.identityHashCode(this)); + if ( (processEngineWireContext!=null) + && (processEngineWireContext.getWireDefinition()!=null) + && (processEngineWireContext.getWireDefinition().getDescriptorTypes()!=null) + ) { + log.debug(" process-engine-context "+System.identityHashCode(processEngineWireContext)); + for (Class<?> descriptorType: processEngineWireContext.getWireDefinition().getDescriptorTypes()) { + log.debug(" "+descriptorType.getName()); + } + } + if ( (transactionWireDefinition!=null) + && (transactionWireDefinition.getDescriptorTypes()!=null) + ) { + log.debug(" transaction-context:"); + for (Class<?> descriptorType: transactionWireDefinition.getDescriptorTypes()) { + log.debug(" "+descriptorType.getName()); + } + } return this; } @@ -135,11 +151,18 @@ return this; } + + public static EnvironmentFactory parseXmlString(String xmlString) { + JbpmConfiguration jbpmConfiguration = new JbpmConfiguration(); + jbpmConfiguration.setXmlString(xmlString); + return jbpmConfiguration; + } + protected void parse(StreamInput streamSource) { isConfigured = true; JbpmConfigurationParser.getInstance() .createParse() - .setDocumentObject(this) + .pushObject(this) .setStreamSource(streamSource) .execute() .checkProblems("jbpm configuration " + streamSource); @@ -164,14 +187,7 @@ return processEngineWireContext.get(RepositoryService.class); } - public static EnvironmentFactory parseXmlString(String xmlString) { - JbpmConfiguration jbpmConfiguration = new JbpmConfiguration(); - jbpmConfiguration.setXmlString(xmlString); - jbpmConfiguration.buildProcessEngine(); - return jbpmConfiguration; - } - public Environment openEnvironment() { return openEnvironment(null); } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -21,9 +21,8 @@ */ package org.jbpm.pvm.internal.env; -import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.api.JbpmException; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; -import org.jbpm.pvm.internal.stream.StreamInput; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.wire.WireDefinition; import org.jbpm.pvm.internal.wire.xml.WireParser; @@ -43,9 +42,11 @@ public class JbpmConfigurationParser extends Parser { private static final long serialVersionUID = 1L; + + // private static Log log = Log.getLog(JbpmConfigurationParser.class.getName()); - Parser environmentFactoryXmlParser = new WireParser(); - Parser environmentXmlParser = new WireParser(); + Parser processEngineContextParser = new WireParser(); + Parser transactionContextParser = new WireParser(); protected static JbpmConfigurationParser INSTANCE = new JbpmConfigurationParser(); @@ -53,25 +54,13 @@ return INSTANCE; } - /** parses the given stream source with {@link #getInstance() the current parser}. */ - static EnvironmentFactory parse(StreamInput streamSource) { - EnvironmentFactory environmentFactory = (EnvironmentFactory) getInstance() - .createParse() - .setStreamSource(streamSource) - .execute() - .checkProblems("environment configuration "+streamSource) - .getDocumentObject(); - return environmentFactory; - } - public Object parseDocument(Document document, Parse parse) { Element documentElement = document.getDocumentElement(); // if the default environment factory was already set in the parse - JbpmConfiguration jbpmConfiguration = (JbpmConfiguration) parse.getDocumentObject(); + JbpmConfiguration jbpmConfiguration = (JbpmConfiguration) parse.findObject(JbpmConfiguration.class); if (jbpmConfiguration==null) { jbpmConfiguration = new JbpmConfiguration(); - parse.setDocumentObject(jbpmConfiguration); } for (Element importElement : XmlUtil.elements(documentElement, "import")) { @@ -79,12 +68,12 @@ String resource = importElement.getAttribute("resource"); Parse importParse = createParse() .setResource(resource) + .pushObject(jbpmConfiguration) .execute(); - importParse.addProblems(importParse.getProblems()); - + parse.addProblems(importParse.getProblems()); JbpmConfiguration importedConfiguration = (JbpmConfiguration) importParse.getDocumentObject(); - + WireDefinition importedProcessEngineWireDefinition = importedConfiguration.getProcessEngineWireContext().getWireDefinition(); jbpmConfiguration.addProcessEngineWireDefinition(importedProcessEngineWireDefinition); @@ -100,14 +89,14 @@ jbpmConfiguration.addTransactionWireDefinition(transactionWireDefinition); parse.setDocumentObject(jbpmConfiguration); - + return jbpmConfiguration; } WireDefinition getProcessEngineWireDefinition(Element documentElement, Parse parse) { Element processEngineElement = XmlUtil.element(documentElement, "process-engine-context"); if (processEngineElement != null) { - return (WireDefinition) environmentFactoryXmlParser.parseDocumentElement(processEngineElement, parse); + return (WireDefinition) processEngineContextParser.parseDocumentElement(processEngineElement, parse); } return null; } @@ -115,21 +104,21 @@ WireDefinition getTransactionWireDefinition(Element documentElement, Parse parse) { Element txCtxElement = XmlUtil.element(documentElement, "transaction-context"); if (txCtxElement != null) { - return (WireDefinition) environmentXmlParser.parseDocumentElement(txCtxElement, parse); + return (WireDefinition) transactionContextParser.parseDocumentElement(txCtxElement, parse); } return null; } - public Parser getEnvironmentFactoryXmlParser() { - return environmentFactoryXmlParser; + public Parser getProcessEngineContextParser() { + return processEngineContextParser; } - public void setEnvironmentFactoryXmlParser(Parser applicationWireXmlParser) { - this.environmentFactoryXmlParser = applicationWireXmlParser; + public void setProcessEngineContextParser(Parser applicationWireXmlParser) { + this.processEngineContextParser = applicationWireXmlParser; } - public Parser getEnvironmentXmlParser() { - return environmentXmlParser; + public Parser getTransactionContextParser() { + return transactionContextParser; } - public void setEnvironmentXmlParser(Parser blockWireXmlParser) { - this.environmentXmlParser = blockWireXmlParser; + public void setTransactionContextParser(Parser blockWireXmlParser) { + this.transactionContextParser = blockWireXmlParser; } } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -21,7 +21,6 @@ */ package org.jbpm.pvm.internal.jobexecutor; -import org.jbpm.api.JbpmException; import org.jbpm.api.env.Environment; import org.jbpm.api.env.Transaction; import org.jbpm.api.job.Message; @@ -53,13 +52,12 @@ if (!isNotificationAdded) { isNotificationAdded = true; - // notify the job executor after the transaction is completed - log.trace("registering job executor notifier with "+transaction); JobExecutor jobExecutor = Environment.getCurrent().get(JobExecutor.class); - if (jobExecutor==null) { - throw new JbpmException("no job executor configured to execute "+message); + if (jobExecutor!=null) { + // notify the job executor after the transaction is completed + log.trace("registering job executor notifier with "+transaction); + transaction.registerSynchronization(new JobAddedNotification(jobExecutor)); } - transaction.registerSynchronization(new JobAddedNotification(jobExecutor)); } } } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -18,7 +18,6 @@ import org.jbpm.api.job.Timer; import org.jbpm.api.session.TimerSession; import org.jbpm.internal.log.Log; -import org.jbpm.pvm.internal.job.TimerImpl; /** * Timers created with this service are committed at the end of the transaction, @@ -28,29 +27,31 @@ * @author Tom Baeyens, Pascal Verdage */ public class JobExecutorTimerSession implements TimerSession { - - private static final Log log = Log.getLog(TimerSession.class.getName()); - + + private static final Log log = Log.getLog(TimerSession.class.getName()); + /* injected */ Transaction transaction; - /* injected */ - JobExecutor jobExecutor; - /* injected */ + JobExecutor jobExecutor; + + /* injected */ JobDbSession jobDbSession; boolean jobExecutorNotificationScheduled = false; - public void schedule(Timer timer) { - log.debug("scheduling "+timer); + public void schedule(Timer timer) { + log.debug("scheduling " + timer); validate(timer); jobDbSession.save(timer); - if (!jobExecutorNotificationScheduled) { + if ( (!jobExecutorNotificationScheduled) + && (jobExecutor!=null) + ) { jobExecutorNotificationScheduled = true; transaction.registerSynchronization(new JobAddedNotification(jobExecutor)); } - } + } protected void validate(Timer timer) { if (timer == null) @@ -58,9 +59,7 @@ if (timer.getExecution() == null) { throw new JbpmException("timer has no execution specified"); } - if ( (timer.getSignalName() == null) - && (timer.getEventName() == null) - ) + if ((timer.getSignalName() == null) && (timer.getEventName() == null)) throw new JbpmException("timer has no signalName or eventName specified"); if (timer.getDueDate() == null) throw new JbpmException("timer scheduled at null date"); @@ -68,12 +67,12 @@ throw new JbpmException("timer scheduled with a negative date"); } - public void cancel(Timer timer) { - log.debug("canceling "+timer); - if (timer != null) { - jobDbSession.delete(timer); - } else { - throw new JbpmException("timer is null"); - } - } + public void cancel(Timer timer) { + log.debug("canceling " + timer); + if (timer != null) { + jobDbSession.delete(timer); + } else { + throw new JbpmException("timer is null"); + } + } } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -22,6 +22,8 @@ package org.jbpm.pvm.internal.repository; import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.io.ObjectStreamException; import java.net.URL; @@ -40,6 +42,7 @@ import org.jbpm.pvm.internal.cmd.DeployCmd; import org.jbpm.pvm.internal.lob.Lob; import org.jbpm.pvm.internal.stream.ByteArrayStreamInput; +import org.jbpm.pvm.internal.stream.FileStreamInput; import org.jbpm.pvm.internal.stream.InputStreamInput; import org.jbpm.pvm.internal.stream.ResourceStreamInput; import org.jbpm.pvm.internal.stream.StreamInput; @@ -115,11 +118,23 @@ return this; } + public Deployment addResourceFromFile(File file) { + addResourceFromStreamInput(file.getPath(), new FileStreamInput(file)); + return this; + } + public Deployment addResourceFromStreamInput(String name, StreamInput streamInput) { if (resources==null) { resources = new HashMap<String, Lob>(); } - byte[] bytes = IoUtil.readBytes(streamInput.openStream()); + byte[] bytes = null; + try { + InputStream inputStream = streamInput.openStream(); + bytes = IoUtil.readBytes(inputStream); + inputStream.close(); + } catch (IOException e) { + throw new JbpmException("couldn't read from "+streamInput, e); + } Lob lob = new Lob(bytes); resources.put(name, lob); return this; Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -703,8 +703,11 @@ if (wireDefinition!=null) { String name = wireDefinition.getDescriptorName(type); if (name!=null) { + log.trace("found "+type.getName()+" in "+this); return type.cast(get(name)); - } + } else { + log.trace(type.getName()+" not found in "+this+" "+System.identityHashCode(this)); + } } return null; } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -26,9 +26,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import org.jbpm.api.env.WireObject; -import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor; @@ -42,7 +42,7 @@ public class WireDefinition implements Serializable { private static final long serialVersionUID = 1L; - private static Log log = Log.getLog(WireDefinition.class.getName()); + // static Log log = Log.getLog(WireDefinition.class.getName()); transient ClassLoader classLoader; /** maps object names to {@link Descriptor}s */ @@ -207,7 +207,10 @@ } } } - + + public Set<Class<?>> getDescriptorTypes() { + return (descriptorNames!=null ? descriptorNames.keySet() : null); + } public Map<String, Descriptor> getDescriptors() { return descriptors; } Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,47 +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.wire.binding; - -import org.jbpm.api.env.EnvironmentFactory; -import org.jbpm.pvm.internal.wire.descriptor.EnvironmentFactoryDescriptor; -import org.jbpm.pvm.internal.xml.Parse; -import org.jbpm.pvm.internal.xml.Parser; -import org.w3c.dom.Element; - -/**parses a descriptor for obtaining a reference to the {@link EnvironmentFactory}. - * - * See schema docs for more details. - * - * @author Tom Baeyens - * @author Guillaume Porcher (documentation) - */ -public class EnvironmentFactoryRefBinding extends WireDescriptorBinding { - - public EnvironmentFactoryRefBinding() { - super("process-engine-ref"); - } - - public Object parse(Element element, Parse parse, Parser parser) { - EnvironmentFactory environmentFactory = (EnvironmentFactory) parse.getDocumentObject(); - return new EnvironmentFactoryDescriptor(environmentFactory); - } -} \ No newline at end of file Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -22,6 +22,7 @@ package org.jbpm.pvm.internal.wire.binding; import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.wire.descriptor.EnvironmentInterceptorDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; @@ -37,7 +38,7 @@ } public Object parse(Element element, Parse parse, Parser parser) { - EnvironmentFactory environmentFactory = (EnvironmentFactory) parse.getDocumentObject(); + EnvironmentFactory environmentFactory = (EnvironmentFactory) parse.findObject(JbpmConfiguration.class); return new EnvironmentInterceptorDescriptor(environmentFactory); } Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,48 @@ +/* + * 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.api.ProcessEngine; +import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.wire.descriptor.ProcessEngineDescriptor; +import org.jbpm.pvm.internal.xml.Parse; +import org.jbpm.pvm.internal.xml.Parser; +import org.w3c.dom.Element; + +/**parses a descriptor for obtaining a reference to the {@link EnvironmentFactory}. + * + * See schema docs for more details. + * + * @author Tom Baeyens + * @author Guillaume Porcher (documentation) + */ +public class ProcessEngineRefBinding extends WireDescriptorBinding { + + public ProcessEngineRefBinding() { + super("process-engine-ref"); + } + + public Object parse(Element element, Parse parse, Parser parser) { + ProcessEngine processEngine = (ProcessEngine) parse.findObject(ProcessEngine.class); + return new ProcessEngineDescriptor(processEngine); + } +} \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,24 +0,0 @@ -package org.jbpm.pvm.internal.wire.descriptor; - -import org.jbpm.api.env.EnvironmentFactory; -import org.jbpm.pvm.internal.wire.WireContext; - -/** the {@link EnvironmentFactory} of the current {@link WireContext}. - * - * @author Tom Baeyens - * @author Guillaume Porcher (documentation) - */ -public class EnvironmentFactoryDescriptor extends AbstractDescriptor { - - private static final long serialVersionUID = 1L; - - EnvironmentFactory environmentFactory; - - public EnvironmentFactoryDescriptor(EnvironmentFactory environmentFactory) { - this.environmentFactory = environmentFactory; - } - - public Object construct(WireContext wireContext) { - return environmentFactory; - } -} Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -267,6 +267,7 @@ for (Field field: declaredFields) { if (! Modifier.isStatic(field.getModifiers())) { String fieldName = field.getName(); + Class<?> fieldType = field.getType(); Object autoWireValue = null; if ("environment".equals(fieldName)) { @@ -281,7 +282,7 @@ autoWireValue = wireContext.get(fieldName); } else { - autoWireValue = wireContext.get(field.getType()); + autoWireValue = wireContext.get(fieldType); } // if auto wire value has not been found in current context, // search in environment @@ -290,7 +291,7 @@ if (currentEnvironment != null) { autoWireValue = currentEnvironment.get(fieldName); if (autoWireValue == null) { - autoWireValue = currentEnvironment.get(field.getType()); + autoWireValue = currentEnvironment.get(fieldType); } } } @@ -301,7 +302,7 @@ ReflectUtil.set(field, object, autoWireValue); } catch (JbpmException e) { if(e.getCause() instanceof IllegalArgumentException) { - log.info("WARNING: couldn't auto wire "+fieldName+" (of type "+field.getType().getName()+") " + + log.info("WARNING: couldn't auto wire "+fieldName+" (of type "+fieldType.getName()+") " + "with value "+autoWireValue + " (of type "+autoWireValue.getClass().getName()+")"); } else { log.info("WARNING: couldn't auto wire "+fieldName+" with value "+autoWireValue); Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,25 @@ +package org.jbpm.pvm.internal.wire.descriptor; + +import org.jbpm.api.ProcessEngine; +import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.wire.WireContext; + +/** the {@link EnvironmentFactory} of the current {@link WireContext}. + * + * @author Tom Baeyens + * @author Guillaume Porcher (documentation) + */ +public class ProcessEngineDescriptor extends AbstractDescriptor { + + private static final long serialVersionUID = 1L; + + protected ProcessEngine processEngine; + + public ProcessEngineDescriptor(ProcessEngine processEngine) { + this.processEngine = processEngine; + } + + public Object construct(WireContext wireContext) { + return processEngine; + } +} Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -49,7 +49,7 @@ Class<?> bindingClass = ReflectUtil.loadClass(classLoader, bindingClassName); binding = (Binding) bindingClass.newInstance(); } catch (Exception e) { - parse.addProblem("couldn't instantiate binding "+bindingClassName, e); + log.trace("couldn't instantiate binding "+bindingClassName); } } else { parse.addProblem("class is a required attribute in a binding "+XmlUtil.toString(bindingElement)); @@ -58,8 +58,6 @@ if (binding!=null) { Bindings bindings = parse.findObject(Bindings.class); bindings.addBinding(binding); - } else { - log.info("WARNING: binding for "+bindingClassName+" could not be parsed. See parsing problems for more details."); } } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -37,7 +37,6 @@ import org.jbpm.pvm.internal.stream.StringStreamInput; import org.jbpm.pvm.internal.stream.UrlStreamInput; import org.w3c.dom.Document; -import org.w3c.dom.Element; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXParseException; @@ -50,7 +49,7 @@ public class Parse extends ProblemList implements ErrorHandler { private static final long serialVersionUID = 1L; - + protected Parser parser; protected ClassLoader classLoader; Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.default.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.default.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + + <repository-service /> + <repository-cache /> + <execution-service /> + <history-service /> + <management-service /> + <task-service /> + + <command-service> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + + <hibernate-configuration> + <cfg resource="jbpm.hibernate.cfg.xml" /> + </hibernate-configuration> + + <hibernate-session-factory /> + + <script-manager default-expression-language="juel" + default-script-language="juel" + read-contexts="execution, environment, process-engine" + write-context=""> + <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> + </script-manager> + + <authentication /> + + <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> + <repository-session /> + <pvm-db-session /> + <job-db-session /> + <task-db-session /> + <message-session /> + <timer-session /> + <history-session /> + <transaction /> + <hibernate-session /> + </transaction-context> + +</jbpm-configuration> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.default.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,358 @@ +<?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 package="org.jbpm.pvm.internal.model" default-access="field"> + + <!-- ### TYPEDEFS ####################################################### --> + <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> + <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> + <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> + <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> + <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> + <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> + <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> + <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> + <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> + <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> + <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> + <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> + </typedef> + + <!-- ### PROCESS DEFINITION ############################################# --> + <class name="ExecutionImpl" + table="JBPM_EXECUTION" + discriminator-value="pvm"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator><column name="CLASS_" /></discriminator> + <version name="dbversion" column="DBVERSION_" /> + + <property name="activityName" column="ACTIVITYNAME_" /> + <property name="processDefinitionId" column="PROCDEFID_" /> + + <property name="hasVariables" column="HASVARS_" /> + <map name="variables" + cascade="all-delete-orphan"> + <key foreign-key="FK_VAR_EXECUTION"> + <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> + </key> + <map-key type="string" column="KEY_" /> + <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> + </map> + + <property name="hasTimers" column="HASTIMERS_" /> + <set name="timers" + cascade="all-delete-orphan"> + <key foreign-key="FK_TMR_EXECUTION"> + <column name="EXECUTION_" /> + </key> + <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> + </set> + + <property name="name" column="NAME_" /> + <property name="key" column="KEY_" /> + <property name="id" column="ID_" unique="true" /> + + <property name="state" column="STATE_" /> + + <property name="priority" column="PRIORITY_" /> + <property name="historyActivityInstanceDbid" column="HISACTINST_" /> + + <!-- many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" / --> + + <!-- many-to-one name="transitionOrigin" + class="org.jbpm.pvm.internal.model.ActivityImpl" + column="TRANSORIG_" + foreign-key="FK_EXEC_TRANSORIG" + index="IDX_EXEC_TRANSORIG" / --> + + <list name="executions" + cascade="all-delete-orphan" + inverse="false" + lazy="false"> + <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> + <list-index column="PARENT_IDX_" /> + <one-to-many class="ExecutionImpl" /> + </list> + + <many-to-one name="parent" + column="PARENT_" + class="ExecutionImpl" + foreign-key="FK_EXEC_PARENT" + index="IDX_EXEC_PARENT" /> + + <many-to-one name="processInstance" + class="ExecutionImpl" + column="INSTANCE_" + foreign-key="FK_EXEC_INSTANCE" + index="IDX_EXEC_INSTANCE" /> + + <many-to-one name="superProcessExecution" + column="SUPEREXEC_" + class="ExecutionImpl" + foreign-key="FK_EXEC_SUPEREXEC" + index="IDX_EXEC_SUPEREXEC" /> + + <many-to-one name="subProcessInstance" + column="SUBPROCINST_" + class="ExecutionImpl" + foreign-key="FK_EXEC_SUBPI" + index="IDX_EXEC_SUBPI" /> + + </class> + + <!-- ### COMMENTS ####################################################### --> + <class name="CommentImpl" table="JBPM_COMMENT"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_" /> + <version name="dbversion" column="DBVERSION_" /> + + <property name="userId" column="USERID_" /> + <property name="time" column="TIME_" /> + <property name="message" column="MESSAGE_" /> + + <list name="comments" + cascade="all-delete-orphan" + inverse="false"> + <key column="PARENT_" foreign-key="none" /> + <list-index column="PARENT_IDX_" /> + <one-to-many class="CommentImpl" /> + </list> + </class> + + <!-- ### VARIABLE ####################################################### --> + <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> + <!-- discriminator values: + date : org.jbpm.pvm.internal.type.variable.DateVariable + double : org.jbpm.pvm.internal.type.variable.DoubleVariable + hibl : org.jbpm.pvm.internal.type.variable.HibernateLongVariable + long : org.jbpm.pvm.internal.type.variable.LongVariable + hibs : org.jbpm.pvm.internal.type.variable.HibernateStringVariable + string : org.jbpm.pvm.internal.type.variable.StringVariable + null : org.jbpm.pvm.internal.type.variable.NullVariable + blob : org.jbpm.pvm.internal.type.variable.BlobVariable + clob : org.jbpm.pvm.internal.type.variable.ClobVariable + --> + + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_"/> + <version name="dbversion" column="DBVERSION_" /> + + <property name="key" column="KEY_"/> + <property name="queryText" column="QUERYTEXT_" /> + <property name="converter" type="converter" column="CONVERTER_" /> + <many-to-one name="processInstance" + column="PROCINST_" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + foreign-key="FK_VAR_PROCINST" + index="IDX_VAR_PROCINST"/> + </class> + + <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> + <property name="date" column="DATE_VALUE_" type="timestamp"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> + <property name="d" column="DOUBLE_VALUE_" type="double"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> + <property name="hibernatable" column="LONG_VALUE_" type="long"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> + <property name="l" column="LONG_VALUE_" type="long"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> + <property name="hibernatable" column="STRING_VALUE_" type="string"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> + <property name="string" column="STRING_VALUE_" type="string"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> + <many-to-one name="lob" + column="LOB_" + cascade="all" + class="org.jbpm.pvm.internal.lob.Lob" + foreign-key="FK_VAR_LOB" + index="IDX_VAR_LOB" /> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> + <many-to-one name="lob" + column="LOB_" + cascade="all" + class="org.jbpm.pvm.internal.lob.Lob" + foreign-key="none"/> + </subclass> + + <!-- ### LOB ############################################################ --> + <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> + <property name="bytes" type="binary" column="BINARY_VALUE_"/> + <property name="clob" type="clob" column="CLOB_VALUE_" /> + <property name="text" type="text" column="TEXT_VALUE_"/> + </class> + + <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_" /> + <version name="dbversion" column="DBVERSION_" /> + + <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> + <property name="isSuspended" column="ISSUSPENDED_" /> + <property name="isExclusive" column="ISEXCLUSIVE_" /> + <property name="lockOwner" column="LOCKOWNER_" /> + <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> + <property name="info" column="INFO_" /> + <property name="exception" column="EXCEPTION_" type="text" /> + <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> + + <many-to-one name="processInstance" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="PROCESSINSTANCE_" + cascade="none" + foreign-key="FK_JOB_PRINST" + index="IDX_JOB_PRINST"/> + <many-to-one name="execution" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="EXECUTION_" + cascade="none" + foreign-key="FK_JOB_EXE" + index="IDX_JOB_EXE"/> + + <!-- many-to-one name="commandDescriptor" + column="CMDDESCR_" + class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" + cascade="all" + foreign-key="FK_JOB_CMDDESCR" + index="IDX_JOB_CMDDESCR"/ --> + + <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> + <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> + <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> + <property name="signalName" column="SIGNAL_" /> + <!-- many-to-one name="activity" + column="NODE_" + cascade="none" + foreign-key="FK_JOB_NODE"/ --> + </subclass> + <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> + <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> + <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> + </subclass> + + <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> + <property name="signalName" column="SIGNAL_" /> + <property name="eventName" column="EVENT_" /> + <property name="repeat" column="REPEAT_" /> + </subclass> + + </class> + + <!-- ### HibernatePvmDbSession QUERIES ################################## --> + + <query name="findTimers"> + <![CDATA[ + select t + from org.jbpm.pvm.internal.job.TimerImpl as t + order by dueDate asc + ]]> + </query> + + <query name="findMessages"> + <![CDATA[ + select m + from org.jbpm.pvm.internal.job.MessageImpl as m + ]]> + </query> + + <query name="findJobsWithException"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where job.retries = 0 + order by dueDate asc + ]]> + </query> + + <!-- ### HibernateJobDbSession QUERIES ################################## --> + <query name="findFirstAcquirableJob"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where ( ( (job.lockExpirationTime is null) + or (job.lockExpirationTime <= :now) + ) + and + ( (job.dueDate is null) + or (job.dueDate <= :now) + ) + and + ( job.retries > 0 ) + ) + order by job.dueDate asc + ]]> + </query> + + <query name="findExclusiveJobs"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where job.lockOwner is null + and job.processInstance = :processInstance + and job.isExclusive = true + and job.retries > 0 + and ( (job.dueDate is null) + or (job.dueDate <= :now) + ) + order by job.dueDate asc + ]]> + </query> + + <query name="findFirstDueJob"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where job.lockOwner is null + and job.retries > 0 + order by job.dueDate asc + ]]> + </query> + + <!-- ### HibernatePvmDbSession QUERIES ############################################# --> + <query name="findExecutionById"> + <![CDATA[ + select execution + from org.jbpm.pvm.internal.model.ExecutionImpl as execution + where execution.id = :id + ]]> + </query> + + <query name="findProcessInstanceById"> + <![CDATA[ + select processInstance + from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance + where processInstance.id = :processInstanceId + and processInstance.parent is null + ]]> + </query> + +</hibernate-mapping> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.history.hbm.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.history.hbm.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,75 @@ +<?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 package="org.jbpm.pvm.internal.history.model" default-access="field"> + + <!-- ### HISTORY PROCESS INSTANCE ####################################### --> + <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> + <id name="processInstanceId" column="ID_"> + <generator class="assigned" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <property name="processDefinitionId" column="PROCDEFID_" /> + <property name="key" column="KEY_" /> + <property name="startTime" column="START_" type="timestamp" /> + <property name="endTime" column="END_" type="timestamp" /> + <property name="duration" column="DURATION_" /> + <property name="state" column="STATE_" /> + <property name="endActivityName" column="ENDACTIVITY_" /> + + <!-- many-to-one name="processDefinition" + class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" + column="PROCDEF_" + foreign-key="FK_HISTPI_PROCDEF" + index="IDX_HISTPI_PROCDEF" / --> + + <set name="historyActivityInstances" + cascade="all"> + <key> + <column name="HPI_" /> + </key> + <one-to-many class="HistoryActivityInstanceImpl" /> + </set> + + </class> + + <!-- ### HISTORY PROCESS INSTANCE ####################################### --> + <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_" /> + <version name="dbversion" column="DBVERSION_" /> + + <many-to-one name="historyProcessInstance" + class="HistoryProcessInstanceImpl" + column="HPI_" + foreign-key="FK_HAI_HPI" + index="IDX_HAI_HPI" /> + + <!-- many-to-one name="activity" + class="org.jbpm.pvm.internal.model.ActivityImpl" + column="ACTIVITY_" + foreign-key="FK_HISTAI_ACT" + index="IDX_HISTAI_ACT" / --> + + <property name="type" column="TYPE_" /> + <property name="executionId" column="EXECUTION_" /> + <property name="activityName" column="ACTIVITY_NAME_" /> + <property name="startTime" column="START_" type="timestamp" /> + <property name="endTime" column="END_" type="timestamp" /> + <property name="duration" column="DURATION_" /> + <property name="transitionName" column="TRANSITION_" /> + + <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> + <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> + </subclass> + + <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> + <property name="assignee" column="ASSIGNEE_" /> + <property name="state" column="STATE_" /> + </subclass> + </class> + +</hibernate-mapping> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.history.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + <identity-service /> + </process-engine-context> + + <transaction-context> + <identity-session /> + </transaction-context> + +</jbpm-configuration> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.hbm.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.hbm.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,59 @@ +<?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 package="org.jbpm.pvm.internal.identity.impl" default-access="field"> + + <!-- ### USER ########################################################### --> + <class name="UserImpl" table="JBPM_ID_USER"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <property name="id" column="ID_" /> + <property name="password" column="PASSWORD_" /> + <property name="givenName" column="GIVENNAME_" /> + <property name="familyName" column="FAMILYNAME_" /> + </class> + + <!-- ### MEMBERSHIP ##################################################### --> + <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <many-to-one name="user" + column="USER_" + class="UserImpl" + foreign-key="FK_MEM_USER" + index="IDX_MEM_USER"/> + + <many-to-one name="group" + column="GROUP_" + class="GroupImpl" + foreign-key="FK_MEM_GROUP" + index="IDX_MEM_GROUP"/> + + <property name="role" column="NAME_" /> + </class> + + <!-- ### GROUP ########################################################### --> + <class name="GroupImpl" table="JBPM_ID_GROUP"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <property name="id" column="ID_" /> + <property name="name" column="NAME_" /> + <property name="type" column="TYPE_" /> + + <many-to-one name="parent" + column="PARENT_" + class="GroupImpl" + foreign-key="FK_GROUP_PARENT" + index="IDX_GROUP_PARENT"/> + </class> + +</hibernate-mapping> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + + <job-executor /> + + </process-engine-context> + +</jbpm-configuration> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.repository.hbm.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.repository.hbm.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.repository.hbm.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.repository.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,50 @@ +<?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 default-access="field"> + + <!-- ### Deployment ##################################################### --> + <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" + table="JBPM_DEPLOYMENT"> + + <!-- ProcessElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + + <property name="name" type="text" column="NAME_" /> + <property name="timestamp" column="TIMESTAMP_" /> + + <map name="resources" cascade="all-delete-orphan"> + <key foreign-key="FK_LOB_DEPLOYMENT"> + <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> + </key> + <map-key type="text" column="NAME_" /> + <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> + </map> + + <set name="objectProperties" + table="JBPM_DEPLOYPROPS" + cascade="all"> + <key column="DEPLOYMENT_" /> + <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> + </set> + + </class> + + <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <many-to-one name="deployment" + class="org.jbpm.pvm.internal.repository.DeploymentImpl" + column="DEPLOYMENT_" + foreign-key="FK_DEPLPROP_DEPL" + index="IDX_DEPLPROP_DEPL" /> + <property name="objectName" column="OBJNAME_" /> + <property name="key" column="KEY_" /> + <property name="stringValue" column="STRINGVAL_" /> + <property name="longValue" column="LONGVAL_" /> + </class> + +</hibernate-mapping> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.repository.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.hbm.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.hbm.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.hbm.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,197 @@ +<?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.pvm.internal.task" default-access="field"> + + <!-- ### ASSIGNABLE DEFINITIONS ######################################### + <class name="AssignableDefinitionImpl" + table="JBPM_ASSIGNDEF" + discriminator-value="A" > + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator><column name="CLASS_" /></discriminator> + <version name="dbversion" column="DBVERSION_" /> + + <property name="name" column="NAME_"/> + <property name="description" column="DESCR_"/> + <property name="assigneeExpression" column="ASS_EXPR_"/> + <property name="assigneeExpressionLanguage" column="ASS_EXPR_LANG_"/> + <property name="candidateUsersExpression" column="CNDUSR_EXPR_"/> + <property name="candidateUsersExpressionLanguage" column="CNDUSR_EXPRLANG_"/> + <property name="candidateGroupsExpression" column="CNDGRP_EXPR_"/> + <property name="candidateGroupsExpressionLanguage" column="CNDGRP_EXPRLANG_"/> + + <many-to-one name="assignmentHandlerDescriptor" + column="ASSHNDLR_DESCR_" + cascade="all" + class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" + foreign-key="FK_ASSHNDLR_DESCR" + index="IDX_ASSHNDLR_DESCR" /> + + <subclass name="SwimlaneDefinitionImpl" discriminator-value="S"> + </subclass> + --> + + <!-- ### TASK DEFINITION ################################################ + <subclass name="TaskDefinitionImpl" discriminator-value="T"> + + <property name="priority" column="PRIORITY_"/> + <property name="dueDateDuration" column="DUEDATE_"/> + + <many-to-one name="taskHandlerDescriptor" + column="TSKHNDLRDESCR_" + cascade="all" + class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" + foreign-key="FK_TSKHNDLR_DESCR" + index="IDX_TSKHNDLR_DESCR" /> + + <many-to-one name="swimlaneDefinition" + column="SWIMLDEF_" + cascade="all" + class="SwimlaneDefinitionImpl" + foreign-key="FK_TSK_SWIMLDEF" + index="IDX_TSK_SWIMLDEF" /> + + <list name="subTaskDefinitions" cascade="all-delete-orphan"> + <key column="TASKDEF_" /> + <list-index column="TASKDEF_IDX_" /> + <one-to-many class="TaskDefinitionImpl" /> + </list> + </subclass> + </class> + --> + + <!-- ### TASK ########################################################### --> + <class name="TaskImpl" + table="JBPM_TASK" + discriminator-value="T"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator type="char" column="CLASS_"/> + <version name="dbversion" column="DBVERSION_" /> + + <property name="id" column="ID_" unique="true" /> + <property name="name" column="NAME_"/> + <property name="description" column="DESCR_"/> + <property name="assignee" column="ASSIGNEE_"/> + + <set name="participations" cascade="all-delete-orphan"> + <key column="TASK_" /> + <one-to-many class="ParticipationImpl" /> + </set> + + <property name="priority" column="PRIORITY_"/> + <property name="create" column="CREATE_"/> + <property name="dueDate" column="DUEDATE_"/> + <property name="progress" column="PROGRESS_"/> + <property name="isSignalling" column="SIGNALLING_"/> + + <!-- + <many-to-one name="variableMap" + class="org.jbpm.pvm.impl.VariableMap" + column="VARMAP_" + foreign-key="FK_TASK_VARMAP" + cascade="all" /> + --> + + <many-to-one name="superTask" + class="TaskImpl" + column="SUPERTASK_" + foreign-key="FK_TASK_SUPERTASK" + index="IDX_TASK_SUPERTASK" /> + + <many-to-one name="execution" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="EXECUTION_" + foreign-key="none" /> + + <many-to-one name="processInstance" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="PROCINST_" + foreign-key="none" /> + + <many-to-one name="swimlane" + class="SwimlaneImpl" + column="SWIMLANE_" + foreign-key="FK_TASK_SWIML" /> + + <property name="taskDefinitionName" column="TASKDEFNAME_"/> + + <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_" /> + <one-to-many class="TaskImpl" /> + </set> + + </class> + + <!-- ### PARTICIPANT #################################################### --> + <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <property name="groupId" column="GROUPID_"/> + <property name="userId" column="USERID_"/> + <property name="type" column="TYPE_" /> + + <many-to-one name="task" + class="TaskImpl" + column="TASK_" + index="IDX_PART_TASK" + foreign-key="FK_PART_TASK" /> + + <many-to-one name="swimlane" + class="SwimlaneImpl" + column="SWIMLANE_" + foreign-key="FK_PART_SWIMLANE" /> + + </class> + + <!-- ### SWIMLANE ####################################################### --> + <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> + <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" / --> + + <many-to-one name="execution" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="EXECUTION_" + foreign-key="none" /> + + <set name="participations" cascade="all-delete-orphan"> + <key column="SWIMLANE_" /> + <one-to-many class="ParticipationImpl" /> + </set> + + </class> + + + <!-- ### QUERIES ######################################################## --> + + <query name="findTasks"> + <![CDATA[ + select task + from org.jbpm.pvm.internal.task.TaskImpl as task + ]]> + </query> + +</hibernate-mapping> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.lifecycle.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -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> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.variable.types.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.variable.types.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.variable.types.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.variable.types.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,34 @@ +<types> + + <!-- types stored in a native column --> + <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> + + <!-- types converted to a string --> + <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + + <!-- types converted to a long --> + <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + + <!-- types converted to a double --> + <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> + + <!-- byte[] and char[] --> + <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> + <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> + + <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> + <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> + + <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> + + <!-- TODO: add ejb3 entity bean support --> + <!-- TODO: add JCR activity support --> + <!-- TODO: add collection support --> + +</types> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.variable.types.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.wire.bindings.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.wire.bindings.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.wire.bindings.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,100 @@ +<wire-bindings> + + <!-- ########################### --> + <!-- ### Descriptor bindings ### --> + <!-- ########################### --> + <!-- basic types --> + <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> + <!-- object and ref --> + <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> + <!-- collections --> + <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> + <!-- environment refs --> + <binding class="org.jbpm.pvm.internal.wire.binding.ProcessEngineRefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> + <!-- various specials --> + <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> + <!-- hibernate bindings --> + <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> + <!-- sessions --> + <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> + + <!-- db sessions --> + <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> + + <!-- dynamic type mapping configuration --> + <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> + <!-- services --> + <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> + + <!-- deployers --> + <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> + + <!-- interceptors --> + <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> + <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.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" /> + + <!-- enterprise bindings --> + <binding class="org.jbpm.enterprise.internal.wire.binding.EjbTimerSessionBinding" /> + <binding class="org.jbpm.enterprise.internal.wire.binding.EjbLocalCommandServiceBinding" /> + <binding class="org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding" /> + + <!-- jpdl bindings --> + <binding class="org.jbpm.jpdl.internal.xml.JpdlDeployerBinding" /> + +</wire-bindings> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.wire.bindings.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -13,26 +13,26 @@ public void testEnvironmentWire(){ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<environment-scopes>" + - " <process-engine-context /> " + - " <transaction-context>" + - " <env-ref name='e' />" + - " </transaction-context>" + - "</environment-scopes>" - ); + "<environment-scopes>" + + " <process-engine-context /> " + + " <transaction-context>" + + " <env-ref name='e' />" + + " </transaction-context>" + + "</environment-scopes>" + ); - Environment environment = environmentFactory.openEnvironment(); + Environment environment = environmentFactory.openEnvironment(); - try{ - Object e = environment.get("e"); + try{ + Object e = environment.get("e"); - assertNotNull(e); - assertEquals(environment, e); - assertEquals(e, ((Environment) e).get("e")); - } finally { - environment.close(); - } - environmentFactory.close(); + assertNotNull(e); + assertEquals(environment, e); + assertEquals(e, ((Environment) e).get("e")); + } finally { + environment.close(); + } + environmentFactory.close(); } public void testEnvironmentFactoryWire(){ Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -2,66 +2,6 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine-context> - - <repository-service /> - <repository-cache /> - <execution-service /> - <history-service /> - <management-service /> - <task-service /> - <identity-service /> - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration> - <cfg resource="jbpm.hibernate.cfg.xml" /> - </hibernate-configuration> + <import resource="jbpm.default.cfg.xml" /> - <hibernate-session-factory /> - - <deployer-manager> - </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="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - - <authentication /> - - <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> - <repository-session /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - <history-session /> - <transaction /> - <hibernate-session /> - <identity-session /> - </transaction-context> - </jbpm-configuration> Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,358 +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 package="org.jbpm.pvm.internal.model" default-access="field"> - - <!-- ### TYPEDEFS ####################################################### --> - <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> - <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> - <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> - <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> - <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> - <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> - <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> - </typedef> - - <!-- ### PROCESS DEFINITION ############################################# --> - <class name="ExecutionImpl" - table="JBPM_EXECUTION" - discriminator-value="pvm"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="activityName" column="ACTIVITYNAME_" /> - <property name="processDefinitionId" column="PROCDEFID_" /> - - <property name="hasVariables" column="HASVARS_" /> - <map name="variables" - cascade="all-delete-orphan"> - <key foreign-key="FK_VAR_EXECUTION"> - <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> - </key> - <map-key type="string" column="KEY_" /> - <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> - </map> - - <property name="hasTimers" column="HASTIMERS_" /> - <set name="timers" - cascade="all-delete-orphan"> - <key foreign-key="FK_TMR_EXECUTION"> - <column name="EXECUTION_" /> - </key> - <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> - </set> - - <property name="name" column="NAME_" /> - <property name="key" column="KEY_" /> - <property name="id" column="ID_" unique="true" /> - - <property name="state" column="STATE_" /> - - <property name="priority" column="PRIORITY_" /> - <property name="historyActivityInstanceDbid" column="HISACTINST_" /> - - <!-- many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" / --> - - <!-- many-to-one name="transitionOrigin" - class="org.jbpm.pvm.internal.model.ActivityImpl" - column="TRANSORIG_" - foreign-key="FK_EXEC_TRANSORIG" - index="IDX_EXEC_TRANSORIG" / --> - - <list name="executions" - cascade="all-delete-orphan" - inverse="false" - lazy="false"> - <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="ExecutionImpl" /> - </list> - - <many-to-one name="parent" - column="PARENT_" - class="ExecutionImpl" - foreign-key="FK_EXEC_PARENT" - index="IDX_EXEC_PARENT" /> - - <many-to-one name="processInstance" - class="ExecutionImpl" - column="INSTANCE_" - foreign-key="FK_EXEC_INSTANCE" - index="IDX_EXEC_INSTANCE" /> - - <many-to-one name="superProcessExecution" - column="SUPEREXEC_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUPEREXEC" - index="IDX_EXEC_SUPEREXEC" /> - - <many-to-one name="subProcessInstance" - column="SUBPROCINST_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUBPI" - index="IDX_EXEC_SUBPI" /> - - </class> - - <!-- ### COMMENTS ####################################################### --> - <class name="CommentImpl" table="JBPM_COMMENT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="userId" column="USERID_" /> - <property name="time" column="TIME_" /> - <property name="message" column="MESSAGE_" /> - - <list name="comments" - cascade="all-delete-orphan" - inverse="false"> - <key column="PARENT_" foreign-key="none" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="CommentImpl" /> - </list> - </class> - - <!-- ### VARIABLE ####################################################### --> - <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> - <!-- discriminator values: - date : org.jbpm.pvm.internal.type.variable.DateVariable - double : org.jbpm.pvm.internal.type.variable.DoubleVariable - hibl : org.jbpm.pvm.internal.type.variable.HibernateLongVariable - long : org.jbpm.pvm.internal.type.variable.LongVariable - hibs : org.jbpm.pvm.internal.type.variable.HibernateStringVariable - string : org.jbpm.pvm.internal.type.variable.StringVariable - null : org.jbpm.pvm.internal.type.variable.NullVariable - blob : org.jbpm.pvm.internal.type.variable.BlobVariable - clob : org.jbpm.pvm.internal.type.variable.ClobVariable - --> - - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="key" column="KEY_"/> - <property name="queryText" column="QUERYTEXT_" /> - <property name="converter" type="converter" column="CONVERTER_" /> - <many-to-one name="processInstance" - column="PROCINST_" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - foreign-key="FK_VAR_PROCINST" - index="IDX_VAR_PROCINST"/> - </class> - - <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> - <property name="date" column="DATE_VALUE_" type="timestamp"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> - <property name="d" column="DOUBLE_VALUE_" type="double"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> - <property name="hibernatable" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> - <property name="l" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> - <property name="hibernatable" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> - <property name="string" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="FK_VAR_LOB" - index="IDX_VAR_LOB" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="none"/> - </subclass> - - <!-- ### LOB ############################################################ --> - <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> - <property name="bytes" type="binary" column="BINARY_VALUE_"/> - <property name="clob" type="clob" column="CLOB_VALUE_" /> - <property name="text" type="text" column="TEXT_VALUE_"/> - </class> - - <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> - <property name="isSuspended" column="ISSUSPENDED_" /> - <property name="isExclusive" column="ISEXCLUSIVE_" /> - <property name="lockOwner" column="LOCKOWNER_" /> - <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> - <property name="info" column="INFO_" /> - <property name="exception" column="EXCEPTION_" type="text" /> - <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCESSINSTANCE_" - cascade="none" - foreign-key="FK_JOB_PRINST" - index="IDX_JOB_PRINST"/> - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - cascade="none" - foreign-key="FK_JOB_EXE" - index="IDX_JOB_EXE"/> - - <!-- many-to-one name="commandDescriptor" - column="CMDDESCR_" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - cascade="all" - foreign-key="FK_JOB_CMDDESCR" - index="IDX_JOB_CMDDESCR"/ --> - - <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> - <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> - <property name="signalName" column="SIGNAL_" /> - <!-- many-to-one name="activity" - column="NODE_" - cascade="none" - foreign-key="FK_JOB_NODE"/ --> - </subclass> - <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> - <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> - <property name="signalName" column="SIGNAL_" /> - <property name="eventName" column="EVENT_" /> - <property name="repeat" column="REPEAT_" /> - </subclass> - - </class> - - <!-- ### HibernatePvmDbSession QUERIES ################################## --> - - <query name="findTimers"> - <![CDATA[ - select t - from org.jbpm.pvm.internal.job.TimerImpl as t - order by dueDate asc - ]]> - </query> - - <query name="findMessages"> - <![CDATA[ - select m - from org.jbpm.pvm.internal.job.MessageImpl as m - ]]> - </query> - - <query name="findJobsWithException"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.retries = 0 - order by dueDate asc - ]]> - </query> - - <!-- ### HibernateJobDbSession QUERIES ################################## --> - <query name="findFirstAcquirableJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where ( ( (job.lockExpirationTime is null) - or (job.lockExpirationTime <= :now) - ) - and - ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - and - ( job.retries > 0 ) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findExclusiveJobs"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.processInstance = :processInstance - and job.isExclusive = true - and job.retries > 0 - and ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findFirstDueJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.retries > 0 - order by job.dueDate asc - ]]> - </query> - - <!-- ### HibernatePvmDbSession QUERIES ############################################# --> - <query name="findExecutionById"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.id = :id - ]]> - </query> - - <query name="findProcessInstanceById"> - <![CDATA[ - select processInstance - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.id = :processInstanceId - and processInstance.parent is null - ]]> - </query> - -</hibernate-mapping> \ No newline at end of file Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -6,19 +6,19 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.format_sql">true</property> - <property name="hibernate.cache.use_second_level_cache">true</property> - <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + </session-factory> </hibernate-configuration> Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,75 +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 package="org.jbpm.pvm.internal.history.model" default-access="field"> - - <!-- ### HISTORY PROCESS INSTANCE ####################################### --> - <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> - <id name="processInstanceId" column="ID_"> - <generator class="assigned" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="processDefinitionId" column="PROCDEFID_" /> - <property name="key" column="KEY_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="state" column="STATE_" /> - <property name="endActivityName" column="ENDACTIVITY_" /> - - <!-- many-to-one name="processDefinition" - class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" - column="PROCDEF_" - foreign-key="FK_HISTPI_PROCDEF" - index="IDX_HISTPI_PROCDEF" / --> - - <set name="historyActivityInstances" - cascade="all"> - <key> - <column name="HPI_" /> - </key> - <one-to-many class="HistoryActivityInstanceImpl" /> - </set> - - </class> - - <!-- ### HISTORY PROCESS INSTANCE ####################################### --> - <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="historyProcessInstance" - class="HistoryProcessInstanceImpl" - column="HPI_" - foreign-key="FK_HAI_HPI" - index="IDX_HAI_HPI" /> - - <!-- many-to-one name="activity" - class="org.jbpm.pvm.internal.model.ActivityImpl" - column="ACTIVITY_" - foreign-key="FK_HISTAI_ACT" - index="IDX_HISTAI_ACT" / --> - - <property name="type" column="TYPE_" /> - <property name="executionId" column="EXECUTION_" /> - <property name="activityName" column="ACTIVITY_NAME_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="transitionName" column="TRANSITION_" /> - - <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> - <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> - </subclass> - - <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> - <property name="assignee" column="ASSIGNEE_" /> - <property name="state" column="STATE_" /> - </subclass> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,59 +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 package="org.jbpm.pvm.internal.identity.impl" default-access="field"> - - <!-- ### USER ########################################################### --> - <class name="UserImpl" table="JBPM_ID_USER"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="password" column="PASSWORD_" /> - <property name="givenName" column="GIVENNAME_" /> - <property name="familyName" column="FAMILYNAME_" /> - </class> - - <!-- ### MEMBERSHIP ##################################################### --> - <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="user" - column="USER_" - class="UserImpl" - foreign-key="FK_MEM_USER" - index="IDX_MEM_USER"/> - - <many-to-one name="group" - column="GROUP_" - class="GroupImpl" - foreign-key="FK_MEM_GROUP" - index="IDX_MEM_GROUP"/> - - <property name="role" column="NAME_" /> - </class> - - <!-- ### GROUP ########################################################### --> - <class name="GroupImpl" table="JBPM_ID_GROUP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="name" column="NAME_" /> - <property name="type" column="TYPE_" /> - - <many-to-one name="parent" - column="PARENT_" - class="GroupImpl" - foreign-key="FK_GROUP_PARENT" - index="IDX_GROUP_PARENT"/> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.activities.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.activities.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,17 +0,0 @@ -<activities> - <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> -</activities> Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.eventlisteners.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,8 +0,0 @@ -<eventlisteners> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> -</eventlisteners> Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.repository.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.repository.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.repository.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,50 +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 default-access="field"> - - <!-- ### Deployment ##################################################### --> - <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" - table="JBPM_DEPLOYMENT"> - - <!-- ProcessElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - - <property name="name" type="text" column="NAME_" /> - <property name="timestamp" column="TIMESTAMP_" /> - - <map name="resources" cascade="all-delete-orphan"> - <key foreign-key="FK_LOB_DEPLOYMENT"> - <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> - </key> - <map-key type="text" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> - </map> - - <set name="objectProperties" - table="JBPM_DEPLOYPROPS" - cascade="all"> - <key column="DEPLOYMENT_" /> - <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> - </set> - - </class> - - <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <many-to-one name="deployment" - class="org.jbpm.pvm.internal.repository.DeploymentImpl" - column="DEPLOYMENT_" - foreign-key="FK_DEPLPROP_DEPL" - index="IDX_DEPLPROP_DEPL" /> - <property name="objectName" column="OBJNAME_" /> - <property name="key" column="KEY_" /> - <property name="stringValue" column="STRINGVAL_" /> - <property name="longValue" column="LONGVAL_" /> - </class> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,197 +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.pvm.internal.task" default-access="field"> - - <!-- ### ASSIGNABLE DEFINITIONS ######################################### - <class name="AssignableDefinitionImpl" - table="JBPM_ASSIGNDEF" - discriminator-value="A" > - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assigneeExpression" column="ASS_EXPR_"/> - <property name="assigneeExpressionLanguage" column="ASS_EXPR_LANG_"/> - <property name="candidateUsersExpression" column="CNDUSR_EXPR_"/> - <property name="candidateUsersExpressionLanguage" column="CNDUSR_EXPRLANG_"/> - <property name="candidateGroupsExpression" column="CNDGRP_EXPR_"/> - <property name="candidateGroupsExpressionLanguage" column="CNDGRP_EXPRLANG_"/> - - <many-to-one name="assignmentHandlerDescriptor" - column="ASSHNDLR_DESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - foreign-key="FK_ASSHNDLR_DESCR" - index="IDX_ASSHNDLR_DESCR" /> - - <subclass name="SwimlaneDefinitionImpl" discriminator-value="S"> - </subclass> - --> - - <!-- ### TASK DEFINITION ################################################ - <subclass name="TaskDefinitionImpl" discriminator-value="T"> - - <property name="priority" column="PRIORITY_"/> - <property name="dueDateDuration" column="DUEDATE_"/> - - <many-to-one name="taskHandlerDescriptor" - column="TSKHNDLRDESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - foreign-key="FK_TSKHNDLR_DESCR" - index="IDX_TSKHNDLR_DESCR" /> - - <many-to-one name="swimlaneDefinition" - column="SWIMLDEF_" - cascade="all" - class="SwimlaneDefinitionImpl" - foreign-key="FK_TSK_SWIMLDEF" - index="IDX_TSK_SWIMLDEF" /> - - <list name="subTaskDefinitions" cascade="all-delete-orphan"> - <key column="TASKDEF_" /> - <list-index column="TASKDEF_IDX_" /> - <one-to-many class="TaskDefinitionImpl" /> - </list> - </subclass> - </class> - --> - - <!-- ### TASK ########################################################### --> - <class name="TaskImpl" - table="JBPM_TASK" - discriminator-value="T"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator type="char" column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" unique="true" /> - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assignee" column="ASSIGNEE_"/> - - <set name="participations" cascade="all-delete-orphan"> - <key column="TASK_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - <property name="priority" column="PRIORITY_"/> - <property name="create" column="CREATE_"/> - <property name="dueDate" column="DUEDATE_"/> - <property name="progress" column="PROGRESS_"/> - <property name="isSignalling" column="SIGNALLING_"/> - - <!-- - <many-to-one name="variableMap" - class="org.jbpm.pvm.impl.VariableMap" - column="VARMAP_" - foreign-key="FK_TASK_VARMAP" - cascade="all" /> - --> - - <many-to-one name="superTask" - class="TaskImpl" - column="SUPERTASK_" - foreign-key="FK_TASK_SUPERTASK" - index="IDX_TASK_SUPERTASK" /> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCINST_" - foreign-key="none" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_TASK_SWIML" /> - - <property name="taskDefinitionName" column="TASKDEFNAME_"/> - - <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_" /> - <one-to-many class="TaskImpl" /> - </set> - - </class> - - <!-- ### PARTICIPANT #################################################### --> - <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="groupId" column="GROUPID_"/> - <property name="userId" column="USERID_"/> - <property name="type" column="TYPE_" /> - - <many-to-one name="task" - class="TaskImpl" - column="TASK_" - index="IDX_PART_TASK" - foreign-key="FK_PART_TASK" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_PART_SWIMLANE" /> - - </class> - - <!-- ### SWIMLANE ####################################################### --> - <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> - <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" / --> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <set name="participations" cascade="all-delete-orphan"> - <key column="SWIMLANE_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - </class> - - - <!-- ### QUERIES ######################################################## --> - - <query name="findTasks"> - <![CDATA[ - select task - from org.jbpm.pvm.internal.task.TaskImpl as task - ]]> - </query> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.lifecycle.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.lifecycle.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.lifecycle.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,13 +0,0 @@ -<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> Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.variable.types.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.variable.types.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.variable.types.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,34 +0,0 @@ -<types> - - <!-- types stored in a native column --> - <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - - <!-- types converted to a string --> - <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - - <!-- types converted to a long --> - <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - - <!-- types converted to a double --> - <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - - <!-- byte[] and char[] --> - <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> - - <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> - <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> - - <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - - <!-- TODO: add ejb3 entity bean support --> - <!-- TODO: add JCR activity support --> - <!-- TODO: add collection support --> - -</types> Deleted: 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-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,93 +0,0 @@ -<wire-bindings> - - <!-- ########################### --> - <!-- ### Descriptor bindings ### --> - <!-- ########################### --> - <!-- basic types --> - <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> - <!-- object and ref --> - <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> - <!-- collections --> - <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> - <!-- environment refs --> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentFactoryRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> - <!-- various specials --> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> - <!-- hibernate bindings --> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> - <!-- sessions --> - <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> - - <!-- db sessions --> - <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> - - <!-- dynamic type mapping configuration --> - <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> - <!-- services --> - <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> - - <!-- deployers --> - <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> - - <!-- interceptors --> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> - <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.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-base/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -87,6 +87,8 @@ } processEngine = configuration.buildProcessEngine(); + + log.debug("using ProcessEngine "+System.identityHashCode(processEngine)); repositoryService = processEngine.get(RepositoryService.class); executionService = processEngine.getExecutionService(); Modified: jbpm4/branches/tbaeyens/modules/test-db/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/pom.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/pom.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -32,12 +32,21 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-api</artifactId> </dependency> - <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-base</artifactId> + <scope>test</scope> + </dependency> </dependencies> Copied: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java) =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,78 @@ +/* + * 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.test.identity; + +import java.util.List; + +import org.jbpm.api.IdentityService; +import org.jbpm.api.identity.Group; +import org.jbpm.api.identity.User; +import org.jbpm.test.JbpmTestCase; + + +/** + * @author Tom Baeyens + */ +public class IdentityTest extends JbpmTestCase { + + public void testSingleUser() throws Exception { + IdentityService identityService = processEngine.get(IdentityService.class); + + identityService.createUser("johndoe", "johndoe", "John", "Doe"); + + List<User> users = identityService.findUsers(); + assertNotNull(users); + assertEquals(1, users.size()); + + User johndoe = users.get(0); + assertEquals("johndoe", johndoe.getId()); + assertEquals("John", johndoe.getGivenName()); + assertEquals("Doe", johndoe.getFamilyName()); + assertEquals("John Doe", johndoe.toString()); + + identityService.deleteUser("johndoe"); + + assertEquals(0, identityService.findUsers().size()); + } + + public void testSingleGroup() throws Exception { + IdentityService identityService = processEngine.get(IdentityService.class); + + identityService.createUser("johndoe", "johndoe", "John", "Doe"); + identityService.createUser("joesmoe", "joesmoe", "Joe", "Smoe"); + identityService.createUser("jackblack", "jackblack", "Jack", "Black"); + + String redhatId = identityService.createGroup("redhat", Group.TYPE_UNIT, null); + String jbossId = identityService.createGroup("jboss", Group.TYPE_UNIT, "redhat"); + String jbpmId = identityService.createGroup("jbpm", Group.TYPE_UNIT, "jboss"); + + identityService.createMembership("johndoe", jbpmId, "developer"); + identityService.createMembership("joesmoe", jbpmId, "developer"); + identityService.createMembership("jackblack", jbossId, "manager"); + + List<Group> groups = identityService.findGroupsByUserAndGroupType("jackblack", Group.TYPE_UNIT); + + assertEquals(1, groups.size()); + Group group = groups.get(0); + assertEquals("unit.jboss", group.getId()); + } +} Property changes on: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java ___________________________________________________________________ Name: svn:mergeinfo + Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cache.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cache.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cache.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,39 +0,0 @@ -<hibernate-cache> - - <class-cache class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.ActivityImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.TransitionImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.EventImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.ExceptionHandlerImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.ObjectReference" /> - <class-cache class="org.jbpm.pvm.internal.model.VariableDefinitionImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.TimerDefinitionImpl" /> - <class-cache class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.exceptionHandlers" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.events" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.activities" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.variableDefinitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.timerDefinitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.attachments" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.exceptionHandlers" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.events" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.activities" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.variableDefinitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.timerDefinitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.incomingTransitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.outgoingTransitions" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.TransitionImpl.exceptionHandlers" /> - <collection-cache collection="org.jbpm.pvm.internal.model.TransitionImpl.events" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.EventImpl.exceptionHandlers" /> - <collection-cache collection="org.jbpm.pvm.internal.model.EventImpl.listenerReferences" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.ExceptionHandlerImpl.eventListenerReferences" /> - - <collection-cache collection="org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor.argDescriptors" /> - <collection-cache collection="org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor.operations" /> - -</hibernate-cache> 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-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -2,67 +2,8 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine-context> - - <repository-service /> - <repository-cache /> - <execution-service /> - <history-service /> - <management-service /> - <task-service /> - <identity-service /> - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration> - <cfg resource="jbpm.hibernate.cfg.xml" /> - </hibernate-configuration> + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.deployermgr.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> - <hibernate-session-factory /> - - <deployer-manager> - <jpdl-deployer /> - </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="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - - <authentication /> - - <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> - <repository-session /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - <history-session /> - <transaction /> - <hibernate-session /> - <identity-session /> - </transaction-context> - </jbpm-configuration> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,358 +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 package="org.jbpm.pvm.internal.model" default-access="field"> - - <!-- ### TYPEDEFS ####################################################### --> - <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> - <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> - <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> - <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> - <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> - <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> - <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> - </typedef> - - <!-- ### PROCESS DEFINITION ############################################# --> - <class name="ExecutionImpl" - table="JBPM_EXECUTION" - discriminator-value="pvm"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="activityName" column="ACTIVITYNAME_" /> - <property name="processDefinitionId" column="PROCDEFID_" /> - - <property name="hasVariables" column="HASVARS_" /> - <map name="variables" - cascade="all-delete-orphan"> - <key foreign-key="FK_VAR_EXECUTION"> - <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> - </key> - <map-key type="string" column="KEY_" /> - <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> - </map> - - <property name="hasTimers" column="HASTIMERS_" /> - <set name="timers" - cascade="all-delete-orphan"> - <key foreign-key="FK_TMR_EXECUTION"> - <column name="EXECUTION_" /> - </key> - <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> - </set> - - <property name="name" column="NAME_" /> - <property name="key" column="KEY_" /> - <property name="id" column="ID_" unique="true" /> - - <property name="state" column="STATE_" /> - - <property name="priority" column="PRIORITY_" /> - <property name="historyActivityInstanceDbid" column="HISACTINST_" /> - - <!-- many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" / --> - - <!-- many-to-one name="transitionOrigin" - class="org.jbpm.pvm.internal.model.ActivityImpl" - column="TRANSORIG_" - foreign-key="FK_EXEC_TRANSORIG" - index="IDX_EXEC_TRANSORIG" / --> - - <list name="executions" - cascade="all-delete-orphan" - inverse="false" - lazy="false"> - <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="ExecutionImpl" /> - </list> - - <many-to-one name="parent" - column="PARENT_" - class="ExecutionImpl" - foreign-key="FK_EXEC_PARENT" - index="IDX_EXEC_PARENT" /> - - <many-to-one name="processInstance" - class="ExecutionImpl" - column="INSTANCE_" - foreign-key="FK_EXEC_INSTANCE" - index="IDX_EXEC_INSTANCE" /> - - <many-to-one name="superProcessExecution" - column="SUPEREXEC_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUPEREXEC" - index="IDX_EXEC_SUPEREXEC" /> - - <many-to-one name="subProcessInstance" - column="SUBPROCINST_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUBPI" - index="IDX_EXEC_SUBPI" /> - - </class> - - <!-- ### COMMENTS ####################################################### --> - <class name="CommentImpl" table="JBPM_COMMENT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="userId" column="USERID_" /> - <property name="time" column="TIME_" /> - <property name="message" column="MESSAGE_" /> - - <list name="comments" - cascade="all-delete-orphan" - inverse="false"> - <key column="PARENT_" foreign-key="none" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="CommentImpl" /> - </list> - </class> - - <!-- ### VARIABLE ####################################################### --> - <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> - <!-- discriminator values: - date : org.jbpm.pvm.internal.type.variable.DateVariable - double : org.jbpm.pvm.internal.type.variable.DoubleVariable - hibl : org.jbpm.pvm.internal.type.variable.HibernateLongVariable - long : org.jbpm.pvm.internal.type.variable.LongVariable - hibs : org.jbpm.pvm.internal.type.variable.HibernateStringVariable - string : org.jbpm.pvm.internal.type.variable.StringVariable - null : org.jbpm.pvm.internal.type.variable.NullVariable - blob : org.jbpm.pvm.internal.type.variable.BlobVariable - clob : org.jbpm.pvm.internal.type.variable.ClobVariable - --> - - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="key" column="KEY_"/> - <property name="queryText" column="QUERYTEXT_" /> - <property name="converter" type="converter" column="CONVERTER_" /> - <many-to-one name="processInstance" - column="PROCINST_" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - foreign-key="FK_VAR_PROCINST" - index="IDX_VAR_PROCINST"/> - </class> - - <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> - <property name="date" column="DATE_VALUE_" type="timestamp"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> - <property name="d" column="DOUBLE_VALUE_" type="double"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> - <property name="hibernatable" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> - <property name="l" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> - <property name="hibernatable" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> - <property name="string" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="FK_VAR_LOB" - index="IDX_VAR_LOB" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="none"/> - </subclass> - - <!-- ### LOB ############################################################ --> - <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> - <property name="bytes" type="binary" column="BINARY_VALUE_"/> - <property name="clob" type="clob" column="CLOB_VALUE_" /> - <property name="text" type="text" column="TEXT_VALUE_"/> - </class> - - <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> - <property name="isSuspended" column="ISSUSPENDED_" /> - <property name="isExclusive" column="ISEXCLUSIVE_" /> - <property name="lockOwner" column="LOCKOWNER_" /> - <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> - <property name="info" column="INFO_" /> - <property name="exception" column="EXCEPTION_" type="text" /> - <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCESSINSTANCE_" - cascade="none" - foreign-key="FK_JOB_PRINST" - index="IDX_JOB_PRINST"/> - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - cascade="none" - foreign-key="FK_JOB_EXE" - index="IDX_JOB_EXE"/> - - <!-- many-to-one name="commandDescriptor" - column="CMDDESCR_" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - cascade="all" - foreign-key="FK_JOB_CMDDESCR" - index="IDX_JOB_CMDDESCR"/ --> - - <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> - <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> - <property name="signalName" column="SIGNAL_" /> - <!-- many-to-one name="activity" - column="NODE_" - cascade="none" - foreign-key="FK_JOB_NODE"/ --> - </subclass> - <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> - <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> - <property name="signalName" column="SIGNAL_" /> - <property name="eventName" column="EVENT_" /> - <property name="repeat" column="REPEAT_" /> - </subclass> - - </class> - - <!-- ### HibernatePvmDbSession QUERIES ################################## --> - - <query name="findTimers"> - <![CDATA[ - select t - from org.jbpm.pvm.internal.job.TimerImpl as t - order by dueDate asc - ]]> - </query> - - <query name="findMessages"> - <![CDATA[ - select m - from org.jbpm.pvm.internal.job.MessageImpl as m - ]]> - </query> - - <query name="findJobsWithException"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.retries = 0 - order by dueDate asc - ]]> - </query> - - <!-- ### HibernateJobDbSession QUERIES ################################## --> - <query name="findFirstAcquirableJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where ( ( (job.lockExpirationTime is null) - or (job.lockExpirationTime <= :now) - ) - and - ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - and - ( job.retries > 0 ) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findExclusiveJobs"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.processInstance = :processInstance - and job.isExclusive = true - and job.retries > 0 - and ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findFirstDueJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.retries > 0 - order by job.dueDate asc - ]]> - </query> - - <!-- ### HibernatePvmDbSession QUERIES ############################################# --> - <query name="findExecutionById"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.id = :id - ]]> - </query> - - <query name="findProcessInstanceById"> - <![CDATA[ - select processInstance - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.id = :processInstanceId - and processInstance.parent is null - ]]> - </query> - -</hibernate-mapping> \ No newline at end of file Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -6,20 +6,21 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.format_sql">true</property> - <property name="hibernate.cache.use_second_level_cache">true</property> - <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + </session-factory> </hibernate-configuration> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.history.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.history.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,75 +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 package="org.jbpm.pvm.internal.history.model" default-access="field"> - - <!-- ### HISTORY PROCESS INSTANCE ####################################### --> - <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> - <id name="processInstanceId" column="ID_"> - <generator class="assigned" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="processDefinitionId" column="PROCDEFID_" /> - <property name="key" column="KEY_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="state" column="STATE_" /> - <property name="endActivityName" column="ENDACTIVITY_" /> - - <!-- many-to-one name="processDefinition" - class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" - column="PROCDEF_" - foreign-key="FK_HISTPI_PROCDEF" - index="IDX_HISTPI_PROCDEF" / --> - - <set name="historyActivityInstances" - cascade="all"> - <key> - <column name="HPI_" /> - </key> - <one-to-many class="HistoryActivityInstanceImpl" /> - </set> - - </class> - - <!-- ### HISTORY PROCESS INSTANCE ####################################### --> - <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="historyProcessInstance" - class="HistoryProcessInstanceImpl" - column="HPI_" - foreign-key="FK_HAI_HPI" - index="IDX_HAI_HPI" /> - - <!-- many-to-one name="activity" - class="org.jbpm.pvm.internal.model.ActivityImpl" - column="ACTIVITY_" - foreign-key="FK_HISTAI_ACT" - index="IDX_HISTAI_ACT" / --> - - <property name="type" column="TYPE_" /> - <property name="executionId" column="EXECUTION_" /> - <property name="activityName" column="ACTIVITY_NAME_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="transitionName" column="TRANSITION_" /> - - <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> - <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> - </subclass> - - <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> - <property name="assignee" column="ASSIGNEE_" /> - <property name="state" column="STATE_" /> - </subclass> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.cfg.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,312 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> - <realms> - <realm> - <id>realm://jbpm-identity</id> - <repository-id-ref>jBPM Identity DB</repository-id-ref> - <identity-type-mappings> - <identity-mapping>IDENTITY</identity-mapping> - </identity-type-mappings> - </realm> - </realms> - - <repositories> - <repository> - <id>jBPM Identity DB</id> - <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> - <external-config/> - <default-identity-store-id>Hibernate Identity Store</default-identity-store-id> - <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id> - <options> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </repository> - </repositories> - - <stores> - <attribute-stores/> - <identity-stores> - <identity-store> - <id>Hibernate Identity Store</id> - <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> - <external-config/> - <supported-relationship-types> - <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> - <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> - </supported-relationship-types> - <supported-identity-object-types> - <identity-object-type> - <name>IDENTITY</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>COMMUNITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>OFFICE</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>SECURITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>PROJECT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref> - <identity-object-type-ref>PEOPLE</identity-object-type-ref> - </relationship> - </relationships> - <credentials> - <credential-type>PASSWORD</credential-type> - </credentials> - <attributes> - <attribute> - <name>picture</name> - <mapping>user.picture</mapping> - <type>binary</type> - <isRequired>false</isRequired> - <isMultivalued>false</isMultivalued> - <isReadOnly>false</isReadOnly> - </attribute> - </attributes> - <options/> - </identity-object-type> - <identity-object-type> - <name>ORGANIZATION</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DIVISION</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>ORGANIZATION_UNIT</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DIVISION</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>OFFICE</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>PEOPLE</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>PROJECT</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>DIVISION</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>DEPARTMENT</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>DEPARTMENT</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>PROJECT</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>PEOPLE</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>ADMINISTRATION</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>COMMUNITY</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>OFFICE</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>SECURITY</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - <identity-object-type> - <name>SYSTEM</name> - <relationships> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>IDENTITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>SECURITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>COMMUNITY</identity-object-type-ref> - </relationship> - <relationship> - <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref> - <identity-object-type-ref>ORGANIZATION</identity-object-type-ref> - </relationship> - </relationships> - <credentials/> - <attributes/> - <options/> - </identity-object-type> - </supported-identity-object-types> - <options> - <option> - <name>persistenceUnit</name> - <value>jboss-identity-jbpm</value> - </option> - <option> - <name>populateRelationshipTypes</name> - <value>true</value> - </option> - <option> - <name>populateIdentityObjectTypes</name> - <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - <option> - <name>isRealmAware</name> - <value>true</value> - </option> - <option> - <name>allowNotDefinedAttributes</name> - <value>true</value> - </option> - </options> - </identity-store> - </identity-stores> - </stores> -</jboss-identity> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,59 +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 package="org.jbpm.pvm.internal.identity.impl" default-access="field"> - - <!-- ### USER ########################################################### --> - <class name="UserImpl" table="JBPM_ID_USER"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="password" column="PASSWORD_" /> - <property name="givenName" column="GIVENNAME_" /> - <property name="familyName" column="FAMILYNAME_" /> - </class> - - <!-- ### MEMBERSHIP ##################################################### --> - <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="user" - column="USER_" - class="UserImpl" - foreign-key="FK_MEM_USER" - index="IDX_MEM_USER"/> - - <many-to-one name="group" - column="GROUP_" - class="GroupImpl" - foreign-key="FK_MEM_GROUP" - index="IDX_MEM_GROUP"/> - - <property name="role" column="NAME_" /> - </class> - - <!-- ### GROUP ########################################################### --> - <class name="GroupImpl" table="JBPM_ID_GROUP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="name" column="NAME_" /> - <property name="type" column="TYPE_" /> - - <many-to-one name="parent" - column="PARENT_" - class="GroupImpl" - foreign-key="FK_GROUP_PARENT" - index="IDX_GROUP_PARENT"/> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.activities.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.activities.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,17 +0,0 @@ -<activities> - <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> -</activities> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.eventlisteners.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,8 +0,0 @@ -<eventlisteners> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> -</eventlisteners> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,123 +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 default-access="field"> - - <!-- subclass name="org.jbpm.jpdl.internal.model.JpdlProcessDefinition" - extends="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" - discriminator-value="jpdl"> - <map name="swimlaneDefinitions" - cascade="all-delete-orphan"> - <key foreign-key="FK_SWLDEF_PROCESS"> - <column name="PROCESS_SWL_" index="IDX_SWLDEF_PROCESS"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneDefinitionImpl" /> - </map> - <map name="taskDefinitions" - cascade="all-delete-orphan"> - <key foreign-key="FK_TSKDEF_PROCESS"> - <column name="PROCESS_" index="IDX_TSKDEF_PROCESS"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.TaskDefinitionImpl" /> - </map> - </subclass --> - - <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" - extends="org.jbpm.pvm.internal.model.ExecutionImpl" - discriminator-value="jpdl"> - - <map name="swimlanes" - cascade="all-delete-orphan"> - <key foreign-key="FK_SWIMLANE_EXEC"> - <column name="EXECUTION_" index="IDX_SWIMLANE_EXEC"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneImpl" /> - </map> - </subclass> - - <!-- class name="org.jbpm.jpdl.internal.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY" abstract="true" discriminator-value="X"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <subclass name="org.jbpm.jpdl.internal.activity.StartActivity" discriminator-value="start" /> - <subclass name="org.jbpm.jpdl.internal.activity.DecisionConditionActivity" discriminator-value="excl-cond" /> - <subclass name="org.jbpm.jpdl.internal.activity.DecisionExpressionActivity" discriminator-value="excl-expr"> - <property name="expr" column="TEXT_" /> - <property name="lang" column="TEXT2_" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.DecisionHandlerActivity" discriminator-value="excl-handler"> - <property name="decisionHandlerName" column="TEXT_" /> - <many-to-one name="decisionHandlerDescriptor" - column="EXCLDESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - foreign-key="FK_ACT_EXCLDESCR" - index="IDX_ACT_EXCLDESCR" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.StateActivity" discriminator-value="state" /> - <subclass name="org.jbpm.jpdl.internal.activity.EndActivity" discriminator-value="end"> - <property name="endProcessInstance" column="ENDPI_" /> - <property name="state" column="TEXT_" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.ForkActivity" discriminator-value="fork" /> - <subclass name="org.jbpm.jpdl.internal.activity.JoinActivity" discriminator-value="join" /> - <subclass name="org.jbpm.jpdl.internal.activity.HqlActivity" discriminator-value="hql"> - <property name="query" column="TEXT_" /> - <property name="resultVariableName" column="TEXT2_" /> - <property name="isResultUnique" column="ISUNIQ_" /> - <many-to-one name="parametersDescriptor" - column="PARAMDESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.ListDescriptor" - foreign-key="FK_ACT_PARAMDESCR" - index="IDX_ACT_PARAMDESCR" /> - - <subclass name="org.jbpm.jpdl.internal.activity.SqlActivity" discriminator-value="sql" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.JavaActivity" discriminator-value="java"> - <property name="methodName" column="TEXT_" /> - <property name="variableName" column="TEXT2_" /> - <many-to-one name="descriptor" - column="JAVADESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - foreign-key="FK_ACT_JAVADESCR" - index="IDX_ACT_JAVADESCR" /> - <many-to-one name="invokeOperation" - column="INVOPER_" - cascade="all" - class="org.jbpm.pvm.internal.wire.operation.InvokeOperation" - foreign-key="FK_ACT_INVKOPER" - index="IDX_ACT_INVKOPER" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.ScriptActivity" discriminator-value="script"> - <property name="script" column="TEXT_" /> - <property name="language" column="TEXT2_" /> - <property name="variableName" column="TEXT3_" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.EsbActivity" discriminator-value="esb"> - <property name="service" column="TEXT_" /> - <property name="category" column="TEXT2_" /> - <many-to-one name="partsListDescriptor" - column="PARTSDESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.ListDescriptor" - foreign-key="FK_ACT_PARTSDESCR" - index="IDX_ACT_PARTSDESCR" /> - </subclass> - <subclass name="org.jbpm.jpdl.internal.activity.TaskActivity" discriminator-value="task"> - <many-to-one name="taskDefinition" - column="TASKDEF_" - cascade="all" - class="org.jbpm.pvm.internal.task.TaskDefinitionImpl" - foreign-key="FK_ACT_TASKDEF" - index="IDX_ACT_TASKDEF" /> - </subclass> - </class> - --> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.repository.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.repository.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.repository.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,50 +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 default-access="field"> - - <!-- ### Deployment ##################################################### --> - <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" - table="JBPM_DEPLOYMENT"> - - <!-- ProcessElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - - <property name="name" type="text" column="NAME_" /> - <property name="timestamp" column="TIMESTAMP_" /> - - <map name="resources" cascade="all-delete-orphan"> - <key foreign-key="FK_LOB_DEPLOYMENT"> - <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> - </key> - <map-key type="text" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> - </map> - - <set name="objectProperties" - table="JBPM_DEPLOYPROPS" - cascade="all"> - <key column="DEPLOYMENT_" /> - <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> - </set> - - </class> - - <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <many-to-one name="deployment" - class="org.jbpm.pvm.internal.repository.DeploymentImpl" - column="DEPLOYMENT_" - foreign-key="FK_DEPLPROP_DEPL" - index="IDX_DEPLPROP_DEPL" /> - <property name="objectName" column="OBJNAME_" /> - <property name="key" column="KEY_" /> - <property name="stringValue" column="STRINGVAL_" /> - <property name="longValue" column="LONGVAL_" /> - </class> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,197 +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.pvm.internal.task" default-access="field"> - - <!-- ### ASSIGNABLE DEFINITIONS ######################################### - <class name="AssignableDefinitionImpl" - table="JBPM_ASSIGNDEF" - discriminator-value="A" > - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assigneeExpression" column="ASS_EXPR_"/> - <property name="assigneeExpressionLanguage" column="ASS_EXPR_LANG_"/> - <property name="candidateUsersExpression" column="CNDUSR_EXPR_"/> - <property name="candidateUsersExpressionLanguage" column="CNDUSR_EXPRLANG_"/> - <property name="candidateGroupsExpression" column="CNDGRP_EXPR_"/> - <property name="candidateGroupsExpressionLanguage" column="CNDGRP_EXPRLANG_"/> - - <many-to-one name="assignmentHandlerDescriptor" - column="ASSHNDLR_DESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - foreign-key="FK_ASSHNDLR_DESCR" - index="IDX_ASSHNDLR_DESCR" /> - - <subclass name="SwimlaneDefinitionImpl" discriminator-value="S"> - </subclass> - --> - - <!-- ### TASK DEFINITION ################################################ - <subclass name="TaskDefinitionImpl" discriminator-value="T"> - - <property name="priority" column="PRIORITY_"/> - <property name="dueDateDuration" column="DUEDATE_"/> - - <many-to-one name="taskHandlerDescriptor" - column="TSKHNDLRDESCR_" - cascade="all" - class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" - foreign-key="FK_TSKHNDLR_DESCR" - index="IDX_TSKHNDLR_DESCR" /> - - <many-to-one name="swimlaneDefinition" - column="SWIMLDEF_" - cascade="all" - class="SwimlaneDefinitionImpl" - foreign-key="FK_TSK_SWIMLDEF" - index="IDX_TSK_SWIMLDEF" /> - - <list name="subTaskDefinitions" cascade="all-delete-orphan"> - <key column="TASKDEF_" /> - <list-index column="TASKDEF_IDX_" /> - <one-to-many class="TaskDefinitionImpl" /> - </list> - </subclass> - </class> - --> - - <!-- ### TASK ########################################################### --> - <class name="TaskImpl" - table="JBPM_TASK" - discriminator-value="T"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator type="char" column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" unique="true" /> - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assignee" column="ASSIGNEE_"/> - - <set name="participations" cascade="all-delete-orphan"> - <key column="TASK_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - <property name="priority" column="PRIORITY_"/> - <property name="create" column="CREATE_"/> - <property name="dueDate" column="DUEDATE_"/> - <property name="progress" column="PROGRESS_"/> - <property name="isSignalling" column="SIGNALLING_"/> - - <!-- - <many-to-one name="variableMap" - class="org.jbpm.pvm.impl.VariableMap" - column="VARMAP_" - foreign-key="FK_TASK_VARMAP" - cascade="all" /> - --> - - <many-to-one name="superTask" - class="TaskImpl" - column="SUPERTASK_" - foreign-key="FK_TASK_SUPERTASK" - index="IDX_TASK_SUPERTASK" /> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCINST_" - foreign-key="none" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_TASK_SWIML" /> - - <property name="taskDefinitionName" column="TASKDEFNAME_"/> - - <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_" /> - <one-to-many class="TaskImpl" /> - </set> - - </class> - - <!-- ### PARTICIPANT #################################################### --> - <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="groupId" column="GROUPID_"/> - <property name="userId" column="USERID_"/> - <property name="type" column="TYPE_" /> - - <many-to-one name="task" - class="TaskImpl" - column="TASK_" - index="IDX_PART_TASK" - foreign-key="FK_PART_TASK" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_PART_SWIMLANE" /> - - </class> - - <!-- ### SWIMLANE ####################################################### --> - <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> - <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" / --> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <set name="participations" cascade="all-delete-orphan"> - <key column="SWIMLANE_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - </class> - - - <!-- ### QUERIES ######################################################## --> - - <query name="findTasks"> - <![CDATA[ - select task - from org.jbpm.pvm.internal.task.TaskImpl as task - ]]> - </query> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.lifecycle.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.lifecycle.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.lifecycle.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,13 +0,0 @@ -<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> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.variable.types.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.variable.types.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.variable.types.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,34 +0,0 @@ -<types> - - <!-- types stored in a native column --> - <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - - <!-- types converted to a string --> - <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - - <!-- types converted to a long --> - <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - - <!-- types converted to a double --> - <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - - <!-- byte[] and char[] --> - <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> - - <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> - <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> - - <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - - <!-- TODO: add ejb3 entity bean support --> - <!-- TODO: add JCR activity support --> - <!-- TODO: add collection support --> - -</types> Deleted: 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-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,95 +0,0 @@ -<wire-bindings> - - <!-- ########################### --> - <!-- ### Descriptor bindings ### --> - <!-- ########################### --> - <!-- basic types --> - <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> - <!-- object and ref --> - <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> - <!-- collections --> - <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> - <!-- environment refs --> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentFactoryRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> - <!-- various specials --> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> - <!-- hibernate bindings --> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> - <!-- sessions --> - <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> - - <!-- db sessions --> - <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> - - <!-- dynamic type mapping configuration --> - <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> - <!-- services --> - <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> - - <!-- deployers --> - <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> - - <!-- interceptors --> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> - <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.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.JpdlDeployerBinding" /> - -</wire-bindings>