[jbpm-commits] JBoss JBPM SVN: r2832 - in jbpm3/branches/jbpm-3.3.0.GA: hudson/hudson-home and 16 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-11-09 07:57:29 -0500 (Sun, 09 Nov 2008) New Revision: 2832 Added: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.mapping.sybase.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/jbpm-sybase-xa-ds.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.sybase.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.sybase.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/action/Script.sybase.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.sybase.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Node.sybase.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.sybase.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Transition.sybase.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.sybase.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.sybase.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.sybase.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.sybase.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.sybase.hbm.xml Removed: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml Modified: jbpm3/branches/jbpm-3.3.0.GA/hudson/hudson-home/command.sh jbpm3/branches/jbpm-3.3.0.GA/hudson/hudson-home/jobs/jBPM3-Matrix/config.xml jbpm3/branches/jbpm-3.3.0.GA/hudson/hudson-home/jobs/jBPM3-ShortMatrix/config.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.cache.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/jbpm-sybase-ds.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/action/Script.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml jbpm3/branches/jbpm-3.3.0.GA/modules/db/scripts/antrun-jbpmschema.xml jbpm3/branches/jbpm-3.3.0.GA/modules/enterprise/jar/pom.xml jbpm3/branches/jbpm-3.3.0.GA/pom.xml jbpm3/branches/jbpm-3.3.0.GA/profiles.xml.example Log: Use special sybase mapping. Enable sybase QA axis Modified: jbpm3/branches/jbpm-3.3.0.GA/hudson/hudson-home/command.sh =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/hudson/hudson-home/command.sh 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/hudson/hudson-home/command.sh 2008-11-09 12:57:29 UTC (rev 2832) @@ -68,6 +68,13 @@ 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/jbpm-3.3.0.GA/hudson/hudson-home/jobs/jBPM3-Matrix/config.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/hudson/hudson-home/jobs/jBPM3-Matrix/config.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/hudson/hudson-home/jobs/jBPM3-Matrix/config.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -44,7 +44,7 @@ <values> <string>hsqldb</string> <string>mysql</string> - <!-- string>postgresql</string --> + <string>sybase</string> </values> </axis> <axis> Modified: jbpm3/branches/jbpm-3.3.0.GA/hudson/hudson-home/jobs/jBPM3-ShortMatrix/config.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/hudson/hudson-home/jobs/jBPM3-ShortMatrix/config.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/hudson/hudson-home/jobs/jBPM3-ShortMatrix/config.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -42,7 +42,7 @@ <values> <string>hsqldb</string> <string>mysql</string> - <!-- string>postgresql</string --> + <string>sybase</string> </values> </axis> <axis> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.cache.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.cache.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.cache.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -1,67 +1,62 @@ - <!-- ################################### --> - <!-- # cache settings # --> - <!-- # strategy="nonstrict-read-write" # --> - <!-- # can be used with hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider # --> - <!-- ################################### --> + <!-- ################################### --> + <!-- # cache settings # --> + <!-- # strategy="nonstrict-read-write" # --> + <!-- # can be used with hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider # --> + <!-- ################################### --> + + <class-cache class="org.jbpm.context.def.VariableAccess" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.file.def.FileDefinition.processFiles" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.action.Script.variableAccesses" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.Action" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.Event" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Event.actions" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.ExceptionHandler" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ExceptionHandler.actions" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.Node" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Node.events" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Node.exceptionHandlers" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Node.leavingTransitions" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Node.arrivingTransitions" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.ProcessDefinition" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.events" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.exceptionHandlers" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.nodes" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.actions" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.definitions" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.def.SuperState.nodes" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.graph.def.Transition" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Transition.events" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.graph.def.Transition.exceptionHandlers" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.node.Decision.decisionConditions" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.node.ProcessState.variableAccesses" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.graph.node.TaskNode.tasks" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.instantiation.Delegation" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.module.def.ModuleDefinition" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.taskmgmt.def.Swimlane.tasks" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.taskmgmt.def.TaskController" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.taskmgmt.def.TaskController.variableAccesses" usage="nonstrict-read-write" /> + + <class-cache class="org.jbpm.taskmgmt.def.Task" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.taskmgmt.def.Task.events" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.taskmgmt.def.Task.exceptionHandlers" usage="nonstrict-read-write" /> + + <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.swimlanes" usage="nonstrict-read-write" /> + <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.tasks" usage="nonstrict-read-write" /> - <class-cache class="org.jbpm.context.def.VariableAccess" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.file.def.FileDefinition.processFiles" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.action.Script.variableAccesses" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.Action" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.Event" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Event.actions" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.ExceptionHandler" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ExceptionHandler.actions" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.Node" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Node.events" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Node.exceptionHandlers" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Node.leavingTransitions" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Node.arrivingTransitions" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.ProcessDefinition" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.events" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.exceptionHandlers" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.nodes" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.actions" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.definitions" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.def.SuperState.nodes" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.graph.def.Transition" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Transition.events" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.graph.def.Transition.exceptionHandlers" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.node.Decision.decisionConditions" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.node.ProcessState.variableAccesses" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.graph.node.TaskNode.tasks" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.instantiation.Delegation" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.module.def.ModuleDefinition" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.taskmgmt.def.Swimlane.tasks" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.taskmgmt.def.TaskController" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.taskmgmt.def.TaskController.variableAccesses" usage="nonstrict-read-write" /> - - <class-cache class="org.jbpm.taskmgmt.def.Task" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.taskmgmt.def.Task.events" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.taskmgmt.def.Task.exceptionHandlers" usage="nonstrict-read-write" /> - - <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.swimlanes" usage="nonstrict-read-write" /> - <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.tasks" usage="nonstrict-read-write" /> - - <!-- - ================================================================================== - END org.jboss.jbpm:jbpm-jpdl-core hibernate.cfg.xml - ================================================================================== - --> Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.mapping.sybase.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/hibernate.mapping.sybase.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.mapping.sybase.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/hibernate.mapping.sybase.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,141 @@ + + <!-- ###################### --> + <!-- # jbpm mapping files # --> + <!-- ###################### --> + + <!-- hql queries and type defs --> + <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> + <!-- hql queries used in simulation for querying historical data + uncomment if you want to use the GetSimulationInputCommand + or maybe you also want to use the queries yourself + be patient: the queries need the stddev function to be enabled in your dialect + more information on this can be found here: http://www.camunda.com/business_process_simulation_news/mysql_and_stddev.... --> + <!-- + <mapping resource="org/jbpm/sim/bam/hibernate.queries.hbm.xml" /> + --> + + <!-- graph.action mapping files --> + <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/> + + <!-- graph.def mapping files --> + <mapping resource="org/jbpm/graph/def/ProcessDefinition.sybase.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Node.sybase.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Transition.sybase.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/> + <mapping resource="org/jbpm/graph/def/ExceptionHandler.sybase.hbm.xml"/> + <mapping resource="org/jbpm/instantiation/Delegation.sybase.hbm.xml"/> + + <!-- ############################################ --> + <!-- # another mapping file with external dependencies # --> + <!-- ############################################ --> + <!-- following mapping file has a dependency on --> + <!-- 'bsh-{version}.jar'. --> + <!-- uncomment this if you don't have bsh on your --> + <!-- classpath. you won't be able to use the --> + <!-- script element in process definition files --> + <!-- has to be defined below org/jbpm/graph/def/Action.hbm.xml --> + <!-- due to the inline collection-cache elements below --> + <mapping resource="org/jbpm/graph/action/Script.sybase.hbm.xml"/> + + <!-- graph.node mapping files --> + <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/State.hbm.xml"/> + <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/> + + <!-- context.def mapping files --> + <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/> + <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/> + + <!-- bytes mapping files --> + <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/> + + <!-- module.def mapping files --> + <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/> + + <!-- file.def mapping files --> + <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/> + + <!-- taskmgmt.def mapping files --> + <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/Task.sybase.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/> + + <!-- scheduler.def mapping files --> + <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/> + <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/> + + <!-- graph.exe mapping files --> + <mapping resource="org/jbpm/graph/exe/Comment.sybase.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/> + <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/> + + <!-- module.exe mapping files --> + <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/> + + <!-- context.exe mapping files --> + <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> + <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.sybase.hbm.xml"/> + + <!-- job mapping files --> + <mapping resource="org/jbpm/job/Job.sybase.hbm.xml"/> + <mapping resource="org/jbpm/job/Timer.hbm.xml"/> + <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/> + <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/> + <mapping resource="org/jbpm/job/CleanUpProcessJob.hbm.xml"/> + + <!-- taskmgmt.exe mapping files --> + <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.sybase.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/> + + <!-- logging mapping files --> + <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/> + <mapping resource="org/jbpm/logging/log/MessageLog.sybase.hbm.xml"/> + <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ActionLog.sybase.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/> + <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/> + <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.sybase.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/> + <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/jbpm-sybase-ds.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/jbpm-sybase-ds.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/jbpm-sybase-ds.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -2,16 +2,14 @@ <datasources> - <xa-datasource> + <local-tx-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 /> @@ -23,6 +21,6 @@ <metadata> <type-mapping>Sybase</type-mapping> </metadata> - </xa-datasource> + </local-tx-datasource> </datasources> Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/jbpm-sybase-xa-ds.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/jbpm-sybase-xa-ds.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/jbpm-sybase-xa-ds.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/jbpm-sybase-xa-ds.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <!-- xa-datasource-class>net.sourceforge.jtds.jdbcx.JtdsDataSource</xa-datasource-class --> + + <xa-datasource-class>com.sybase.jdbc3.jdbc.SybXADataSource</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 /> + + <exception-sorter-class-name> + org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter + </exception-sorter-class-name> + + <!-- corresponding type-mapping in conf/standardjbosscmp-jdbc.xml --> + <metadata> + <type-mapping>Sybase</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Deleted: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -1,23 +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.JcrNodeInstance" - extends="org.jbpm.context.exe.VariableInstance" - discriminator-value="J"> - - <!-- - NOTE: these propertynames don't match the column names very well. - The motivation for this was to keep the database schema unchanged - between jBPM 3.1 and jBPM 3.2 - --> - - <property name="repository" column="LONGIDCLASS_" /> - <property name="workspace" column="STRINGIDCLASS_" /> - <property name="path" column="STRINGVALUE_" type="${sql.type.text}" /> - - </subclass> -</hibernate-mapping> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -8,6 +8,6 @@ <subclass name="org.jbpm.context.exe.variableinstance.StringInstance" extends="org.jbpm.context.exe.VariableInstance" discriminator-value="S"> - <property name="value" type="${sql.type.text}" column="STRINGVALUE_"/> + <property name="value" type="text" column="STRINGVALUE_"/> </subclass> </hibernate-mapping> Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.sybase.hbm.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.sybase.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,13 @@ +<?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> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -9,8 +9,8 @@ <subclass name="org.jbpm.context.log.variableinstance.StringUpdateLog" extends="org.jbpm.context.log.VariableUpdateLog" discriminator-value="U"> - <property name="oldValue" column="OLDSTRINGVALUE_" type="${sql.type.text}"/> - <property name="newValue" column="NEWSTRINGVALUE_" type="${sql.type.text}"/> + <property name="oldValue" column="OLDSTRINGVALUE_" type="text"/> + <property name="newValue" column="NEWSTRINGVALUE_" type="text"/> </subclass> </hibernate-mapping> Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.sybase.hbm.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.sybase.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,16 @@ +<?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> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/action/Script.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/action/Script.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/action/Script.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -7,7 +7,7 @@ <subclass name="org.jbpm.graph.action.Script" discriminator-value="S" extends="org.jbpm.graph.def.Action"> - <property name="expression" column="EXPRESSION_" type="${sql.type.text}" /> + <property name="expression" column="EXPRESSION_" type="text" /> <set name="variableAccesses" cascade="all"> <key column="SCRIPT_" foreign-key="FK_VARACC_SCRIPT"/> <one-to-many class="org.jbpm.context.def.VariableAccess" /> Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/action/Script.sybase.hbm.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/action/Script.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/action/Script.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/action/Script.sybase.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,16 @@ +<?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> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -9,7 +9,7 @@ <id name="id" column="ID_"><generator class="native" /></id> <property name="exceptionClassName" column="EXCEPTIONCLASSNAME_" - type="${sql.type.text}" /> + type="text" /> <any name="graphElement" id-type="long" meta-type="char"> <meta-value value="A" class="org.jbpm.taskmgmt.def.Task"/> Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.sybase.hbm.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.sybase.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,38 @@ +<?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> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -25,7 +25,7 @@ <!-- GRAPHELEMENT --> <property name="name" column="NAME_"/> - <property name="description" column="DESCRIPTION_" type="${sql.type.text}"/> + <property name="description" column="DESCRIPTION_" type="text"/> <many-to-one name="processDefinition" column="PROCESSDEFINITION_" foreign-key="FK_NODE_PROCDEF" Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Node.sybase.hbm.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/Node.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Node.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Node.sybase.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,69 @@ +<?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> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -13,7 +13,7 @@ <!-- GRAPHELEMENT --> <!-- base class fields are mapped here --> <property name="name" column="NAME_" /> - <property name="description" column="DESCRIPTION_" type="${sql.type.text}"/> + <property name="description" column="DESCRIPTION_" type="text"/> <map name="events" cascade="all"> <key column="PROCESSDEFINITION_" foreign-key="FK_EVENT_PROCDEF" /> <index column="EVENTTYPE_" type="string"/> Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.sybase.hbm.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.sybase.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,62 @@ +<?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> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -10,7 +10,7 @@ <!-- GRAPHELEMENT --> <property name="name" column="NAME_"/> - <property name="description" column="DESCRIPTION_" type="${sql.type.text}"></property> + <property name="description" column="DESCRIPTION_" type="text"></property> <many-to-one name="processDefinition" column="PROCESSDEFINITION_" foreign-key="FK_TRANS_PROCDEF" Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Transition.sybase.hbm.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/def/Transition.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Transition.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/def/Transition.sybase.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,41 @@ +<?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> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -11,7 +11,7 @@ <property name="actorId" column="ACTORID_"/> <property name="time" column="TIME_"/> - <property name="message" column="MESSAGE_" type="${sql.type.text}"/> + <property name="message" column="MESSAGE_" type="text"/> <many-to-one name="token" column="TOKEN_" foreign-key="FK_COMMENT_TOKEN" Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.sybase.hbm.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.sybase.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,25 @@ +<?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> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -10,7 +10,7 @@ extends="org.jbpm.logging.log.CompositeLog" discriminator-value="A"> - <property name="exception" column="EXCEPTION_" type="${sql.type.text}"/> + <property name="exception" column="EXCEPTION_" type="text"/> <many-to-one name="action" column="ACTION_" class="org.jbpm.graph.def.Action" Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,21 @@ +<?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> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -8,8 +8,8 @@ table="JBPM_DELEGATION"> <id name="id" column="ID_"><generator class="native" /></id> - <property name="className" column="CLASSNAME_" type="${sql.type.text}" /> - <property name="configuration" column="CONFIGURATION_" type="${sql.type.text}" /> + <property name="className" column="CLASSNAME_" type="text" /> + <property name="configuration" column="CONFIGURATION_" type="text" /> <property name="configType" column="CONFIGTYPE_"/> <many-to-one name="processDefinition" Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.sybase.hbm.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.sybase.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,22 @@ +<?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> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -35,7 +35,7 @@ <property name="isExclusive" column="ISEXCLUSIVE_" /> <property name="lockOwner" column="LOCKOWNER_" /> <property name="lockTime" column="LOCKTIME_" /> - <property name="exception" column="EXCEPTION_" type="${sql.type.text}"/> + <property name="exception" column="EXCEPTION_" type="text"/> <property name="retries" column="RETRIES_" /> </class> Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,43 @@ +<?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> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -9,7 +9,7 @@ <subclass name="org.jbpm.logging.log.MessageLog" extends="org.jbpm.logging.log.ProcessLog" discriminator-value="M"> - <property name="message" column="MESSAGE_" type="${sql.type.text}"/> + <property name="message" column="MESSAGE_" type="text"/> </subclass> </hibernate-mapping> Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.sybase.hbm.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.sybase.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,15 @@ +<?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> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -12,7 +12,7 @@ <!-- GRAPHELEMENT --> <property name="name" column="NAME_" /> - <property name="description" column="DESCRIPTION_" type="${sql.type.text}"/> + <property name="description" column="DESCRIPTION_" type="text"/> <many-to-one name="processDefinition" column="PROCESSDEFINITION_" foreign-key="FK_TASK_PROCDEF" Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.sybase.hbm.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.sybase.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,65 @@ +<?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> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -14,7 +14,7 @@ <version name="version" column="VERSION_" /> <property name="name" column="NAME_" /> - <property name="description" column="DESCRIPTION_" type="${sql.type.text}"/> + <property name="description" column="DESCRIPTION_" type="text"/> <property name="actorId" column="ACTORID_" index="IDX_TASK_ACTORID"/> <property name="create" column="CREATE_" /> <property name="start" column="START_" /> Copied: jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.sybase.hbm.xml (from rev 2831, jbpm3/branches/tdiesler/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.sybase.hbm.xml) =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.sybase.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.sybase.hbm.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -0,0 +1,70 @@ +<?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/jbpm-3.3.0.GA/modules/db/scripts/antrun-jbpmschema.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/db/scripts/antrun-jbpmschema.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/db/scripts/antrun-jbpmschema.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -22,25 +22,25 @@ <property name="scriptsdir" value="${basedir}/target/classes" /> <mkdir dir="${scriptsdir}" /> - - <jbpmschema output="${scriptsdir}/jbpm.jpdl.db2.sql" jbpmCfg="jbpm/db2.jbpm.cfg.xml" actions="create" text="true" quiet="true"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.derby.sql" jbpmCfg="jbpm/derby.jbpm.cfg.xml" actions="create" text="true" quiet="true"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.firebird.sql" jbpmCfg="jbpm/firebird.jbpm.cfg.xml" actions="create" text="true" quiet="true"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.hsqldb.sql" jbpmCfg="jbpm/hsqldb.jbpm.cfg.xml" actions="create" text="true" quiet="true"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.ingres.sql" jbpmCfg="jbpm/ingres.jbpm.cfg.xml" actions="create" text="true" quiet="true"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.interbase.sql" jbpmCfg="jbpm/interbase.jbpm.cfg.xml" actions="create" text="true" quiet="true"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.mckoi.sql" jbpmCfg="jbpm/mckoi.jbpm.cfg.xml" actions="create" text="true" quiet="true"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.mssql.sql" jbpmCfg="jbpm/mssql.jbpm.cfg.xml" actions="create" text="true" quiet="true"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.mysql.sql" jbpmCfg="jbpm/mysql.jbpm.cfg.xml" actions="create" text="true" quiet="true"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.oracle.sql" jbpmCfg="jbpm/oracle.jbpm.cfg.xml" delimiter=";" actions="create" text="true" quiet="true"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.sql" jbpmCfg="jbpm/postgresql.jbpm.cfg.xml" actions="create" text="true" quiet="true"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.sapdb.sql" jbpmCfg="jbpm/sapdb.jbpm.cfg.xml" actions="create" text="true" quiet="true"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.sybase.sql" jbpmCfg="jbpm/sybase.jbpm.cfg.xml" actions="create" text="true" quiet="true"/> + + <jbpmschema output="${scriptsdir}/jbpm.jpdl.db2.sql" jbpmCfg="jbpm/db2.jbpm.cfg.xml" actions="create" text="true" quiet="true" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.derby.sql" jbpmCfg="jbpm/derby.jbpm.cfg.xml" actions="create" text="true" quiet="true" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.firebird.sql" jbpmCfg="jbpm/firebird.jbpm.cfg.xml" actions="create" text="true" quiet="true" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.hsqldb.sql" hibernateCfg="hibernate.cfg.hsqldb.xml" jbpmCfg="jbpm/hsqldb.jbpm.cfg.xml" actions="create" text="true" quiet="true" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.ingres.sql" jbpmCfg="jbpm/ingres.jbpm.cfg.xml" actions="create" text="true" quiet="true" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.interbase.sql" jbpmCfg="jbpm/interbase.jbpm.cfg.xml" actions="create" text="true" quiet="true" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.mckoi.sql" jbpmCfg="jbpm/mckoi.jbpm.cfg.xml" actions="create" text="true" quiet="true" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.mssql.sql" jbpmCfg="jbpm/mssql.jbpm.cfg.xml" actions="create" text="true" quiet="true" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.mysql.sql" hibernateCfg="hibernate.cfg.mysql.xml" jbpmCfg="jbpm/mysql.jbpm.cfg.xml" actions="create" text="true" quiet="true" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.oracle.sql" jbpmCfg="jbpm/oracle.jbpm.cfg.xml" delimiter=";" actions="create" text="true" quiet="true" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.sql" hibernateCfg="hibernate.cfg.postgresql.xml" jbpmCfg="jbpm/postgresql.jbpm.cfg.xml" actions="create" text="true" quiet="true" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.sapdb.sql" jbpmCfg="jbpm/sapdb.jbpm.cfg.xml" actions="create" text="true" quiet="true" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.sybase.sql" hibernateCfg="hibernate.cfg.sybase.xml" jbpmCfg="jbpm/sybase.jbpm.cfg.xml" actions="create" text="true" quiet="true" /> <!--[JBPM-1813] Fix create schema generation --> - <!--jbpmschema output="${scriptsdir}/jbpm.jpdl.informix.sql" jbpmCfg="jbpm/informix.jbpm.cfg.xml" actions="create" text="true" quiet="true"/--> - <!--jbpmschema output="${scriptsdir}/jbpm.jpdl.pointbase.sql" jbpmCfg="jbpm/pointbase.jbpm.cfg.xml" actions="create" text="true" quiet="true"/--> - <!--jbpmschema output="${scriptsdir}/jbpm.jpdl.progress.sql" jbpmCfg="jbpm/progress.jbpm.cfg.xml" actions="create" text="true" quiet="true"/--> + <!--jbpmschema output="${scriptsdir}/jbpm.jpdl.informix.sql" jbpmCfg="jbpm/informix.jbpm.cfg.xml" actions="create" text="true" quiet="true"/--> + <!--jbpmschema output="${scriptsdir}/jbpm.jpdl.pointbase.sql" jbpmCfg="jbpm/pointbase.jbpm.cfg.xml" actions="create" text="true" quiet="true"/--> + <!--jbpmschema output="${scriptsdir}/jbpm.jpdl.progress.sql" jbpmCfg="jbpm/progress.jbpm.cfg.xml" actions="create" text="true" quiet="true"/--> </target> </project> Modified: jbpm3/branches/jbpm-3.3.0.GA/modules/enterprise/jar/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/modules/enterprise/jar/pom.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/modules/enterprise/jar/pom.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -352,6 +352,14 @@ <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <!-- [JBPM-1818] Use Sybase instance that supports XA Transaction --> + <exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude> + <exclude>org/jbpm/persistence/jta/JtaDbPersistenceTest.java</exclude> + <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude> + </excludes> + </configuration> </plugin> </plugins> </build> Modified: jbpm3/branches/jbpm-3.3.0.GA/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/pom.xml 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/pom.xml 2008-11-09 12:57:29 UTC (rev 2832) @@ -490,7 +490,6 @@ </activation> <properties> <database>hsqldb</database> - <sql.type.text>text</sql.type.text> </properties> <dependencies> <dependency> @@ -513,9 +512,6 @@ <value>hsqldb</value> </property> </activation> - <properties> - <sql.type.text>text</sql.type.text> - </properties> <dependencies> <dependency> <groupId>hsqldb</groupId> @@ -537,9 +533,6 @@ <value>mysql</value> </property> </activation> - <properties> - <sql.type.text>text</sql.type.text> - </properties> <dependencies> <dependency> <groupId>mysql</groupId> @@ -561,9 +554,6 @@ <value>postgresql</value> </property> </activation> - <properties> - <sql.type.text>text</sql.type.text> - </properties> <dependencies> <dependency> <groupId>postgresql</groupId> @@ -585,22 +575,20 @@ <value>sybase</value> </property> </activation> - <properties> - <sql.type.text>string</sql.type.text> - </properties> <dependencies> + <!-- <dependency> <groupId>net.sourceforge.jtds</groupId> <artifactId>jtds</artifactId> <scope>test</scope> </dependency> - <!-- + --> <dependency> <groupId>com.sybase</groupId> <artifactId>jconnect</artifactId> - <scope>test</scope> + <systemPath>${jdbc.sybase.jar}</systemPath> + <scope>system</scope> </dependency> - --> </dependencies> <repositories> <repository> Modified: jbpm3/branches/jbpm-3.3.0.GA/profiles.xml.example =================================================================== --- jbpm3/branches/jbpm-3.3.0.GA/profiles.xml.example 2008-11-09 12:30:28 UTC (rev 2831) +++ jbpm3/branches/jbpm-3.3.0.GA/profiles.xml.example 2008-11-09 12:57:29 UTC (rev 2832) @@ -30,9 +30,9 @@ <jdbc.sybase.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.sybase.driver> <jdbc.sybase.url>jdbc:jtds:sybase://localhost:5000/jbpmtest</jdbc.sybase.url> + <jdbc.sybase.jar>/opt/sybase/ase1502dev/shared/lib/jconn3.jar</jdbc.sybase.jar> <jdbc.sybase.driver>com.sybase.jdbc3.jdbc.SybDriver</jdbc.sybase.driver> <jdbc.sybase.url>jdbc:sybase:Tds:localhost:5000/jbpmtest</jdbc.sybase.url> - <jdbc.sybase.server>localhost</jdbc.sybase.server> <jdbc.sybase.port>5000</jdbc.sybase.port> <jdbc.sybase.database>jbpmtest</jdbc.sybase.database>