Author: alex.guizar(a)jboss.com Date: 2008-09-03 08:18:10 -0400 (Wed, 03 Sep 2008) New Revision: 2082 Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml Log: removed commented hibernate settings in core that actually belong to enterprise Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml =================================================================== --- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml 2008-09-03 11:03:03 UTC (rev 2081) +++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml 2008-09-03 12:18:10 UTC (rev 2082) @@ -1,4 +1,4 @@ - + <!-- ################################### --> <!-- # cache settings # --> <!-- # strategy="nonstrict-read-write" # --> @@ -60,71 +60,6 @@ <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" /> - <!-- ############################ --> - <!-- # cache settings # --> - <!-- # strategy="transactional" # --> - <!-- # can be used with hibernate.cache.provider_class=org.hibernate.cache.TreeCacheProvider # --> - <!-- ############################ --> - - <!-- - - <class-cache class="org.jbpm.context.def.VariableAccess" usage="transactional" /> - - <collection-cache collection="org.jbpm.file.def.FileDefinition.processFiles" usage="transactional" /> - - <collection-cache collection="org.jbpm.graph.action.Script.variableAccesses" usage="transactional" /> - - <class-cache class="org.jbpm.graph.def.Action" usage="transactional" /> - - <class-cache class="org.jbpm.graph.def.Event" usage="transactional" /> - <collection-cache collection="org.jbpm.graph.def.Event.actions" usage="transactional" /> - - <class-cache class="org.jbpm.graph.def.ExceptionHandler" usage="transactional" /> - <collection-cache collection="org.jbpm.graph.def.ExceptionHandler.actions" usage="transactional" /> - - <class-cache class="org.jbpm.graph.def.Node" usage="transactional" /> - <collection-cache collection="org.jbpm.graph.def.Node.events" usage="transactional" /> - <collection-cache collection="org.jbpm.graph.def.Node.exceptionHandlers" usage="transactional" /> - <collection-cache collection="org.jbpm.graph.def.Node.leavingTransitions" usage="transactional" /> - <collection-cache collection="org.jbpm.graph.def.Node.arrivingTransitions" usage="transactional" /> - - <class-cache class="org.jbpm.graph.def.ProcessDefinition" usage="transactional" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.events" usage="transactional" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.exceptionHandlers" usage="transactional" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.nodes" usage="transactional" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.actions" usage="transactional" /> - <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.definitions" usage="transactional" /> - - <collection-cache collection="org.jbpm.graph.def.SuperState.nodes" usage="transactional" /> - - <class-cache class="org.jbpm.graph.def.Transition" usage="transactional" /> - <collection-cache collection="org.jbpm.graph.def.Transition.events" usage="transactional" /> - <collection-cache collection="org.jbpm.graph.def.Transition.exceptionHandlers" usage="transactional" /> - - <collection-cache collection="org.jbpm.graph.node.Decision.decisionConditions" usage="transactional" /> - - <collection-cache collection="org.jbpm.graph.node.ProcessState.variableAccesses" usage="transactional" /> - - <collection-cache collection="org.jbpm.graph.node.TaskNode.tasks" usage="transactional" /> - - <class-cache class="org.jbpm.instantiation.Delegation" usage="transactional" /> - - <class-cache class="org.jbpm.module.def.ModuleDefinition" usage="transactional" /> - - <collection-cache collection="org.jbpm.taskmgmt.def.Swimlane.tasks" usage="transactional" /> - - <class-cache class="org.jbpm.taskmgmt.def.TaskController" usage="transactional" /> - <collection-cache collection="org.jbpm.taskmgmt.def.TaskController.variableAccesses" usage="transactional" /> - - <class-cache class="org.jbpm.taskmgmt.def.Task" usage="transactional" /> - <collection-cache collection="org.jbpm.taskmgmt.def.Task.events" usage="transactional" /> - <collection-cache collection="org.jbpm.taskmgmt.def.Task.exceptionHandlers" usage="transactional" /> - - <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.swimlanes" usage="transactional" /> - <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.tasks" usage="transactional" /> - - --> - <!-- ================================================================================== END org.jboss.jbpm:jbpm-jpdl-core hibernate.cfg.xml Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml =================================================================== --- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml 2008-09-03 11:03:03 UTC (rev 2081) +++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml 2008-09-03 12:18:10 UTC (rev 2082) @@ -2,40 +2,20 @@ <!-- ################################### --> <!-- # common settings # --> <!-- ################################### --> - + + <!-- Simple memory-only cache --> <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - + + <!-- Automatic schema creation --> <property name="hibernate.hbm2ddl.auto">create</property> + <!-- logging properties --> + <property name="hibernate.format_sql">true</property> + <property name="hibernate.use_sql_comments">true</property> + <!-- ############################################ --> <!-- # mapping files with external dependencies # --> <!-- ############################################ --> <!-- Additional mappings defined per module go here --> <mapping resource="hibernate.extra.hbm.xml" /> - - <!-- DataSource properties (begin) === - <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDataSource</property> - ==== DataSource properties (end) --> - - <!-- JTA transaction properties (begin) === - <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> - <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> - ==== JTA transaction properties (end) --> - - <!-- following mapping files have a dependency on the JCR API - <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/> - --> - - <!-- CMT transaction properties (begin) === - <property name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property> - <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> - ==== CMT transaction properties (end) --> - - <!-- logging properties - <property name="hibernate.show_sql">true</property> - <property name="hibernate.format_sql">true</property> - <property name="hibernate.use_sql_comments">true</property> - --> - - \ No newline at end of file