[jbpm-commits] JBoss JBPM SVN: r2857 - in jbpm3/branches/tdiesler: hudson/hudson-home and 13 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-11-10 11:21:56 -0500 (Mon, 10 Nov 2008) New Revision: 2857 Removed: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.sybase.hbm.xml jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.sybase.hbm.xml jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/action/Script.sybase.hbm.xml jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.sybase.hbm.xml jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/Node.sybase.hbm.xml jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.sybase.hbm.xml jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/Transition.sybase.hbm.xml jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.sybase.hbm.xml jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.sybase.hbm.xml jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.sybase.hbm.xml jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.sybase.hbm.xml jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.sybase.hbm.xml Modified: jbpm3/branches/tdiesler/hudson/hudson-home/command.sh jbpm3/branches/tdiesler/modules/core/src/main/resources/jbpm-sybase-ds.xml jbpm3/branches/tdiesler/modules/simulation/pom.xml jbpm3/branches/tdiesler/pom.xml Log: Remove dependency on jtds Modified: jbpm3/branches/tdiesler/hudson/hudson-home/command.sh =================================================================== --- jbpm3/branches/tdiesler/hudson/hudson-home/command.sh 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/hudson/hudson-home/command.sh 2008-11-10 16:21:56 UTC (rev 2857) @@ -68,13 +68,6 @@ cp $JBOSS_HOME/docs/examples/jbpm/jbpm-$DATABASE-ds.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.xml cp $JBOSS_HOME/docs/examples/jbpm/hibernate.cfg.$DATABASE.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml -# [JBPM-1820] Replace proprietary sybase driver with OS alternative -SYBASE_JDBC_DRIVER=/opt/sybase/ase1502dev/shared/lib/jconn3.jar -if [ -f $SYBASE_JDBC_DRIVER ]; then - echo "cp $SYBASE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" - cp $SYBASE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar -fi - # # start jbossas # Modified: jbpm3/branches/tdiesler/modules/core/src/main/resources/jbpm-sybase-ds.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/jbpm-sybase-ds.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/jbpm-sybase-ds.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -2,13 +2,15 @@ <datasources> - <local-tx-datasource> + <xa-datasource> <jndi-name>JbpmDS</jndi-name> - <driver-class>com.sybase.jdbc3.jdbc.SybXADataSource</driver-class> - <connection-url>${jdbc.sybase.url}</connection-url> - <user-name>${jdbc.sybase.username}</user-name> - <password>${jdbc.sybase.password}</password> + <xa-datasource-class>net.sourceforge.jtds.jdbcx.JtdsDataSource</xa-datasource-class> + <xa-datasource-property name="ServerName">${jdbc.sybase.server}</xa-datasource-property> + <xa-datasource-property name="PortNumber">${jdbc.sybase.port}</xa-datasource-property> + <xa-datasource-property name="DatabaseName">${jdbc.sybase.database}</xa-datasource-property> + <xa-datasource-property name="User">${jdbc.sybase.username}</xa-datasource-property> + <xa-datasource-property name="Password">${jdbc.sybase.password}</xa-datasource-property> <!-- disable transaction interleaving --> <track-connection-by-tx /> @@ -21,6 +23,6 @@ <metadata> <type-mapping>Sybase</type-mapping> </metadata> - </local-tx-datasource> + </xa-datasource> </datasources> Deleted: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.sybase.hbm.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.sybase.hbm.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.sybase.hbm.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -1,13 +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" default-access="field"> - <subclass name="org.jbpm.context.exe.variableinstance.StringInstance" - extends="org.jbpm.context.exe.VariableInstance" - discriminator-value="S"> - <property name="value" type="string" column="STRINGVALUE_"/> - </subclass> -</hibernate-mapping> Deleted: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.sybase.hbm.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.sybase.hbm.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.sybase.hbm.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -1,16 +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" default-access="field"> - - <subclass name="org.jbpm.context.log.variableinstance.StringUpdateLog" - extends="org.jbpm.context.log.VariableUpdateLog" - discriminator-value="U"> - <property name="oldValue" column="OLDSTRINGVALUE_" type="string"/> - <property name="newValue" column="NEWSTRINGVALUE_" type="string"/> - </subclass> - -</hibernate-mapping> Deleted: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/action/Script.sybase.hbm.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/action/Script.sybase.hbm.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/action/Script.sybase.hbm.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -1,16 +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" default-access="field" > - <subclass name="org.jbpm.graph.action.Script" - discriminator-value="S" - extends="org.jbpm.graph.def.Action"> - <property name="expression" column="EXPRESSION_" type="string" /> - <set name="variableAccesses" cascade="all"> - <key column="SCRIPT_" foreign-key="FK_VARACC_SCRIPT"/> - <one-to-many class="org.jbpm.context.def.VariableAccess" /> - </set> - </subclass> -</hibernate-mapping> Deleted: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.sybase.hbm.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.sybase.hbm.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.sybase.hbm.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -1,38 +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" default-access="field"> - <class name="org.jbpm.graph.def.ExceptionHandler" - table="JBPM_EXCEPTIONHANDLER"> - <id name="id" column="ID_"><generator class="native" /></id> - - <property name="exceptionClassName" column="EXCEPTIONCLASSNAME_" - type="string" /> - - <any name="graphElement" id-type="long" meta-type="char"> - <meta-value value="A" class="org.jbpm.taskmgmt.def.Task"/> - <meta-value value="C" class="org.jbpm.graph.node.ProcessState" /> - <meta-value value="D" class="org.jbpm.graph.node.Decision" /> - <meta-value value="E" class="org.jbpm.graph.node.EndState" /> - <meta-value value="F" class="org.jbpm.graph.node.Fork" /> - <meta-value value="J" class="org.jbpm.graph.node.Join" /> - <meta-value value="K" class="org.jbpm.graph.node.TaskNode" /> - <meta-value value="N" class="org.jbpm.graph.def.Node" /> - <meta-value value="P" class="org.jbpm.graph.def.ProcessDefinition"/> - <meta-value value="R" class="org.jbpm.graph.node.StartState" /> - <meta-value value="S" class="org.jbpm.graph.node.State" /> - <meta-value value="T" class="org.jbpm.graph.def.Transition"/> - <meta-value value="U" class="org.jbpm.graph.def.SuperState" /> - <column name="TYPE_"/> - <column name="GRAPHELEMENT_"/> - </any> - <list name="actions" cascade="all"> - <key column="EXCEPTIONHANDLER_" foreign-key="FK_ACTION_EXPTHDL" /> - <list-index column="EXCEPTIONHANDLERINDEX_" /> - <one-to-many class="org.jbpm.graph.def.Action" /> - </list> - - </class> -</hibernate-mapping> Deleted: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/Node.sybase.hbm.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/Node.sybase.hbm.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/Node.sybase.hbm.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -1,69 +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" default-access="field"> - <class name="org.jbpm.graph.def.Node" - table="JBPM_NODE" - discriminator-value="N"> - <id name="id" column="ID_"><generator class="native" /></id> - <discriminator type="char" column="CLASS_"/> - <!-- KEEP THIS IN SYNC WITH Event.hbm.xml, ExceptionHandler.hbm.xml and RuntimeAction.bhm.xml !!! --> - <!-- NOTE that the characters may not overlap with other GraphElement identifiers --> - <!-- C : org.jbpm.graph.node.ProcessState --> - <!-- D : org.jbpm.graph.node.Decision --> - <!-- E : org.jbpm.graph.node.EndState --> - <!-- F : org.jbpm.graph.node.Fork --> - <!-- J : org.jbpm.graph.node.Join --> - <!-- K : org.jbpm.graph.node.TaskNode --> - <!-- M : org.jbpm.graph.node.MailNode --> - <!-- N : org.jbpm.graph.def.Node --> - <!-- R : org.jbpm.graph.node.StartState --> - <!-- S : org.jbpm.graph.node.State --> - <!-- U : org.jbpm.graph.def.SuperState --> - - <!-- GRAPHELEMENT --> - <property name="name" column="NAME_"/> - <property name="description" column="DESCRIPTION_" type="string"/> - <many-to-one name="processDefinition" - column="PROCESSDEFINITION_" - foreign-key="FK_NODE_PROCDEF" - index="IDX_NODE_PROCDEF"/> - <map name="events" cascade="all"> - <key column="NODE_" foreign-key="FK_EVENT_NODE" /> - <index column="EVENTTYPE_" type="string"/> - <one-to-many class="org.jbpm.graph.def.Event" /> - </map> - <list name="exceptionHandlers" cascade="all"> - <key column="NODE_" foreign-key="none" /> - <list-index column="GRAPHELEMENTINDEX_" /> - <one-to-many class="org.jbpm.graph.def.ExceptionHandler" /> - </list> - <!-- ============ --> - - <property name="isAsync" column="ISASYNC_"/> - <property name="isAsyncExclusive" column="ISASYNCEXCL_"/> - - <many-to-one name="action" - column="ACTION_" - cascade="all" - foreign-key="FK_NODE_ACTION" - index="IDX_NODE_ACTION" /> - <many-to-one name="superState" - column="SUPERSTATE_" - foreign-key="FK_NODE_SUPERSTATE" - index="IDX_NODE_SUPRSTATE"/> - - <list name="leavingTransitions" cascade="all"> - <key column="FROM_" /> - <list-index column="FROMINDEX_" /> - <one-to-many class="org.jbpm.graph.def.Transition" /> - </list> - <set name="arrivingTransitions"> - <key column="TO_" /> - <one-to-many class="org.jbpm.graph.def.Transition" /> - </set> - - </class> -</hibernate-mapping> Deleted: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.sybase.hbm.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.sybase.hbm.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.sybase.hbm.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -1,62 +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" default-access="field"> - <class name="org.jbpm.graph.def.ProcessDefinition" - table="JBPM_PROCESSDEFINITION" - discriminator-value="P"> - <id name="id" column="ID_"><generator class="native" /></id> - <discriminator type="char" column="CLASS_" /> - - <!-- GRAPHELEMENT --> - <!-- base class fields are mapped here --> - <property name="name" column="NAME_" /> - <property name="description" column="DESCRIPTION_" type="string"/> - <map name="events" cascade="all"> - <key column="PROCESSDEFINITION_" foreign-key="FK_EVENT_PROCDEF" /> - <index column="EVENTTYPE_" type="string"/> - <one-to-many class="org.jbpm.graph.def.Event" /> - </map> - <list name="exceptionHandlers" cascade="all" lazy="false"> - <key column="PROCESSDEFINITION_" foreign-key="none" /> - <list-index column="GRAPHELEMENTINDEX_" /> - <one-to-many class="org.jbpm.graph.def.ExceptionHandler" /> - </list> - <!-- ============ --> - - <property name="version" column="VERSION_"/> - <property name="isTerminationImplicit" column="ISTERMINATIONIMPLICIT_"/> - <many-to-one name="startState" - column="STARTSTATE_" - foreign-key="FK_PROCDEF_STRTSTA" - index="IDX_PROCDEF_STRTST" /> - <list name="nodes" cascade="all" where="SUPERSTATE_ is null"> - <!-- - replace the key element - <key column="PROCESSDEFINITION_" /> - below with - <key column="PROCDEF_NODES_" /> - in case you want the superstates and their nodes to be - persisted correctly. since this affects the schema - (addition of column PROCDEF_NODES_ to table JBPM_NODE) - we can't introduce this fix till 3.3 - --> - <key column="PROCESSDEFINITION_" /> - <list-index column="NODECOLLECTIONINDEX_" /> - <one-to-many class="org.jbpm.graph.def.Node" /> - </list> - <map name="actions" cascade="all" inverse="true"> - <key column="PROCESSDEFINITION_" /> - <map-key column="NAME_" type="string"/> - <one-to-many class="org.jbpm.graph.def.Action" /> - </map> - <map name="definitions" cascade="all"> - <key column="PROCESSDEFINITION_" /> - <map-key column="NAME_" type="string"/> - <one-to-many class="org.jbpm.module.def.ModuleDefinition" /> - </map> - - </class> -</hibernate-mapping> Deleted: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/Transition.sybase.hbm.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/Transition.sybase.hbm.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/Transition.sybase.hbm.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -1,41 +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" default-access="field"> - <class name="org.jbpm.graph.def.Transition" - table="JBPM_TRANSITION"> - <id name="id" column="ID_"><generator class="native" /></id> - - <!-- GRAPHELEMENT --> - <property name="name" column="NAME_"/> - <property name="description" column="DESCRIPTION_" type="string"></property> - <many-to-one name="processDefinition" - column="PROCESSDEFINITION_" - foreign-key="FK_TRANS_PROCDEF" - index="IDX_TRANS_PROCDEF"/> - <map name="events" cascade="all"> - <key column="TRANSITION_" foreign-key="FK_EVENT_TRANS" /> - <index column="EVENTTYPE_" type="string" /> - <one-to-many class="org.jbpm.graph.def.Event" /> - </map> - <list name="exceptionHandlers" cascade="all" lazy="false"> - <key column="TRANSITION_" foreign-key="none" /> - <list-index column="GRAPHELEMENTINDEX_" /> - <one-to-many class="org.jbpm.graph.def.ExceptionHandler" /> - </list> - <!-- ============ --> - - <many-to-one name="from" - column="FROM_" - foreign-key="FK_TRANSITION_FROM" - index="IDX_TRANSIT_FROM"/> - <many-to-one name="to" - column="TO_" - foreign-key="FK_TRANSITION_TO" - index="IDX_TRANSIT_TO"/> - <property name="condition" column="CONDITION_"/> - - </class> -</hibernate-mapping> Deleted: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.sybase.hbm.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.sybase.hbm.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.sybase.hbm.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -1,25 +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" default-access="field"> - <class name="org.jbpm.graph.exe.Comment" - table="JBPM_COMMENT"> - <id name="id" column="ID_"><generator class="native" /></id> - <version name="version" column="VERSION_" /> - - <property name="actorId" column="ACTORID_"/> - <property name="time" column="TIME_"/> - <property name="message" column="MESSAGE_" type="string"/> - <many-to-one name="token" - column="TOKEN_" - foreign-key="FK_COMMENT_TOKEN" - index="IDX_COMMENT_TOKEN"/> - <many-to-one name="taskInstance" - column="TASKINSTANCE_" - foreign-key="FK_COMMENT_TSK" - index="IDX_COMMENT_TSK"/> - - </class> -</hibernate-mapping> Deleted: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -1,21 +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" default-access="field"> - - <subclass name="org.jbpm.graph.log.ActionLog" - extends="org.jbpm.logging.log.CompositeLog" - discriminator-value="A"> - - <property name="exception" column="EXCEPTION_" type="string"/> - <many-to-one name="action" - column="ACTION_" - class="org.jbpm.graph.def.Action" - foreign-key="FK_LOG_ACTION" /> - - </subclass> - -</hibernate-mapping> Deleted: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.sybase.hbm.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.sybase.hbm.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.sybase.hbm.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -1,22 +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" default-access="field"> - <class name="org.jbpm.instantiation.Delegation" - table="JBPM_DELEGATION"> - <id name="id" column="ID_"><generator class="native" /></id> - - <property name="className" column="CLASSNAME_" type="string" /> - <property name="configuration" column="CONFIGURATION_" type="string" /> - <property name="configType" column="CONFIGTYPE_"/> - - <many-to-one name="processDefinition" - column="PROCESSDEFINITION_" - foreign-key="FK_DELEGATION_PRCD" - index="IDX_DELEG_PRCD" - cascade="none" /> - - </class> -</hibernate-mapping> Deleted: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -1,43 +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" default-access="field"> - - <class name="org.jbpm.job.Job" - table="JBPM_JOB" - discriminator-value="J"> - <id name="id" column="ID_"><generator class="native" /></id> - <discriminator type="char" column="CLASS_"/> - <version name="version" column="VERSION_" /> - - <property name="dueDate" column="DUEDATE_" type="timestamp"/> - - <many-to-one name="processInstance" - column="PROCESSINSTANCE_" - cascade="none" - foreign-key="FK_JOB_PRINST" - index="IDX_JOB_PRINST"/> - <many-to-one name="token" - column="TOKEN_" - cascade="none" - foreign-key="FK_JOB_TOKEN" - index="IDX_JOB_TOKEN"/> - <many-to-one name="taskInstance" - column="TASKINSTANCE_" - cascade="none" - foreign-key="FK_JOB_TSKINST" - index="IDX_JOB_TSKINST"/> - - <property name="isSuspended" column="ISSUSPENDED_" /> - <property name="isExclusive" column="ISEXCLUSIVE_" /> - <property name="lockOwner" column="LOCKOWNER_" /> - <property name="lockTime" column="LOCKTIME_" /> - <property name="exception" column="EXCEPTION_" type="string"/> - <property name="retries" column="RETRIES_" /> - - </class> - -</hibernate-mapping> Deleted: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.sybase.hbm.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.sybase.hbm.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.sybase.hbm.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -1,15 +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" default-access="field"> - - <subclass name="org.jbpm.logging.log.MessageLog" - extends="org.jbpm.logging.log.ProcessLog" - discriminator-value="M"> - <property name="message" column="MESSAGE_" type="string"/> - </subclass> - -</hibernate-mapping> Deleted: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.sybase.hbm.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.sybase.hbm.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.sybase.hbm.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -1,65 +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" default-access="field"> - - <class name="org.jbpm.taskmgmt.def.Task" - table="JBPM_TASK"> - <id name="id" column="ID_"><generator class="native" /></id> - - <!-- GRAPHELEMENT --> - <property name="name" column="NAME_" /> - <property name="description" column="DESCRIPTION_" type="string"/> - <many-to-one name="processDefinition" - column="PROCESSDEFINITION_" - foreign-key="FK_TASK_PROCDEF" - index="IDX_TASK_PROCDEF"/> - <map name="events" cascade="all"> - <key column="TASK_" foreign-key="FK_EVENT_TASK" /> - <index column="EVENTTYPE_" type="string"/> - <one-to-many class="org.jbpm.graph.def.Event" /> - </map> - <list name="exceptionHandlers" cascade="all" lazy="false"> - <key column="TASK_" foreign-key="none" /> - <list-index column="GRAPHELEMENTINDEX_" /> - <one-to-many class="org.jbpm.graph.def.ExceptionHandler" /> - </list> - <!-- ============ --> - - <property name="isBlocking" column="ISBLOCKING_" /> - <property name="isSignalling" column="ISSIGNALLING_" /> - <property name="condition" column="CONDITION_" /> - <property name="dueDate" column="DUEDATE_" /> - <property name="priority" column="PRIORITY_" /> - <property name="actorIdExpression" column="ACTORIDEXPRESSION_" /> - <property name="pooledActorsExpression" column="POOLEDACTORSEXPRESSION_" /> - - <many-to-one name="taskMgmtDefinition" - column="TASKMGMTDEFINITION_" - foreign-key="FK_TASK_TASKMGTDEF" - index="IDX_TASK_TASKMGTDF"/> - <many-to-one name="taskNode" - column="TASKNODE_" - foreign-key="FK_TASK_TASKNODE" - index="IDX_TASK_TSKNODE"/> - <many-to-one name="startState" - column="STARTSTATE_" - foreign-key="FK_TASK_STARTST"/> - <many-to-one name="assignmentDelegation" - column="ASSIGNMENTDELEGATION_" - foreign-key="FK_TASK_ASSDEL" - cascade="all" /> - <many-to-one name="swimlane" - column="SWIMLANE_" - foreign-key="FK_TASK_SWIMLANE"/> - <many-to-one name="taskController" - column="TASKCONTROLLER_" - foreign-key="FK_TSK_TSKCTRL" - cascade="all" /> - - </class> - -</hibernate-mapping> Deleted: jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.sybase.hbm.xml =================================================================== --- jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.sybase.hbm.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.sybase.hbm.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -1,70 +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" default-access="field"> - - <class name="org.jbpm.taskmgmt.exe.TaskInstance" - table="JBPM_TASKINSTANCE" - discriminator-value="T"> - <id name="id" column="ID_"><generator class="native" /></id> - <discriminator type="char" column="CLASS_"/> - <version name="version" column="VERSION_" /> - - <property name="name" column="NAME_" /> - <property name="description" column="DESCRIPTION_" type="string"/> - <property name="actorId" column="ACTORID_" index="IDX_TASK_ACTORID"/> - <property name="create" column="CREATE_" /> - <property name="start" column="START_" /> - <property name="end" column="END_" /> - <property name="dueDate" column="DUEDATE_" /> - <property name="priority" column="PRIORITY_" /> - <property name="isCancelled" column="ISCANCELLED_" /> - <property name="isSuspended" column="ISSUSPENDED_" /> - <property name="isOpen" column="ISOPEN_" /> - <property name="isSignalling" column="ISSIGNALLING_" /> - <property name="isBlocking" column="ISBLOCKING_" /> - - <many-to-one name="task" - column="TASK_" - foreign-key="FK_TASKINST_TASK" - index="IDX_TASKINST_TSK"/> - <many-to-one name="token" - column="TOKEN_" - foreign-key="FK_TASKINST_TOKEN" - index="IDX_TASKINST_TOKN"/> - <many-to-one name="processInstance" - column="PROCINST_" - foreign-key="FK_TSKINS_PRCINS" - index="IDX_TASKINST_TSK"/> - <many-to-one name="swimlaneInstance" - column="SWIMLANINSTANCE_" - foreign-key="FK_TASKINST_SLINST" - index="IDX_TSKINST_SLINST" /> - <many-to-one name="taskMgmtInstance" - column="TASKMGMTINSTANCE_" - foreign-key="FK_TASKINST_TMINST" - index="IDX_TSKINST_TMINST"/> - - <map name="variableInstances" cascade="all"> - <key column="TASKINSTANCE_" foreign-key="FK_VAR_TSKINST"/> - <index type="string" column="NAME_" /> - <one-to-many class="org.jbpm.context.exe.VariableInstance" /> - </map> - <set name="pooledActors" - cascade="all" - table="JBPM_TASKACTORPOOL"> - <key column="TASKINSTANCE_" foreign-key="FK_TASKACTPL_TSKI"/> - <many-to-many class="org.jbpm.taskmgmt.exe.PooledActor" column="POOLEDACTOR_" /> - </set> - <list name="comments" cascade="all" > - <key column="TASKINSTANCE_" /> - <index column="TASKINSTANCEINDEX_" /> - <one-to-many class="org.jbpm.graph.exe.Comment" /> - </list> - - </class> - -</hibernate-mapping> Modified: jbpm3/branches/tdiesler/modules/simulation/pom.xml =================================================================== --- jbpm3/branches/tdiesler/modules/simulation/pom.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/modules/simulation/pom.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -48,6 +48,10 @@ <artifactId>jasperreports</artifactId> <exclusions> <exclusion> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + </exclusion> + <exclusion> <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> </exclusion> @@ -60,7 +64,7 @@ <dependency> <groupId>commons-digester</groupId> <artifactId>commons-digester</artifactId> - <version>1.7</version> + <version>1.6</version> </dependency> <!-- Test Dependencies --> Modified: jbpm3/branches/tdiesler/pom.xml =================================================================== --- jbpm3/branches/tdiesler/pom.xml 2008-11-10 16:02:10 UTC (rev 2856) +++ jbpm3/branches/tdiesler/pom.xml 2008-11-10 16:21:56 UTC (rev 2857) @@ -82,7 +82,6 @@ <mysql.connector.version>5.0.8</mysql.connector.version> <postgresql.version>8.3-603.jdbc3</postgresql.version> <jtds.version>1.2.2</jtds.version> - <jconnect.version>6.0.5</jconnect.version> </properties> <!-- DependencyManagement --> @@ -373,11 +372,6 @@ <artifactId>jtds</artifactId> <version>${jtds.version}</version> </dependency> - <dependency> - <groupId>com.sybase</groupId> - <artifactId>jconnect</artifactId> - <version>${jconnect.version}</version> - </dependency> </dependencies> </dependencyManagement>