[jbpm-commits] JBoss JBPM SVN: r2114 - in jbpm3/trunk/modules: enterprise and 7 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Sep 4 14:12:57 EDT 2008
Author: alex.guizar at jboss.com
Date: 2008-09-04 14:12:56 -0400 (Thu, 04 Sep 2008)
New Revision: 2114
Removed:
jbpm3/trunk/modules/enterprise/scripts/antrun-jbpm-config.xml
jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.cache.xml
jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.common.xml
jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.mapping.xml
jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.hsqldb.xml
jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.mysql.xml
jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.postgresql.xml
Modified:
jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/web.xml
jbpm3/trunk/modules/enterprise/pom.xml
jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml
jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/ejb/impl/CommandServiceBean.java
jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EntitySchedulerServiceFactory.java
jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/ejb-jar.xml
jbpm3/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java
jbpm3/trunk/modules/jpdl/userguide/src/main/doocbook/en/modules/enterprise.xml
Log:
JBPM-1709: timer bean name used in test web.xml did not match name used by scheduler service to lookup
removed hibernate settings from enterprise module, moved them back to core
Modified: jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/web.xml
===================================================================
--- jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/web.xml 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/web.xml 2008-09-04 18:12:56 UTC (rev 2114)
@@ -173,7 +173,7 @@
Link to the local entity bean that implements the scheduler service. Required for
processes that contain timers.
</description>
- <ejb-ref-name>ejb/LocalTimerEntityBean</ejb-ref-name>
+ <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
<local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home>
<local>org.jbpm.ejb.LocalTimerEntity</local>
Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-04 18:12:56 UTC (rev 2114)
@@ -124,19 +124,6 @@
</tasks>
</configuration>
</execution>
- <execution>
- <id>concat-hibernate-config</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="database" value="${database}" />
- <ant antfile="scripts/antrun-jbpm-config.xml" target="concat" />
- </tasks>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
@@ -193,7 +180,7 @@
<configuration>
<excludes>
<!-- https://jira.jboss.org/jira/browse/JBPM-1708 -->
- <exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude>
+ <!--exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude-->
<exclude>org/jbpm/msg/jms/AsyncProcessingTest.java</exclude>
</excludes>
</configuration>
Deleted: jbpm3/trunk/modules/enterprise/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/scripts/antrun-jbpm-config.xml 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/enterprise/scripts/antrun-jbpm-config.xml 2008-09-04 18:12:56 UTC (rev 2114)
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id: antrun-jbpm-config.xml 2069 2008-09-02 12:30:53Z thomas.diesler at jboss.com $ -->
-
-<project default="concat">
-
- <property name="project.build.directory" value="${basedir}/target"/>
- <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
-
- <macrodef name="macro-database-cfg">
- <attribute name="database" />
- <sequential>
-
- <available property="database.properties.available" file="${project.resources.directory}/hibernate.properties.@{database}.xml"/>
- <fail message="hibernate.properties.@{database}.xml not available" unless="database.properties.available"/>
-
- <echo message="Concat hibernate.cfg.@{database}.xml using hibernate.properties.@{database}.xml" />
-
- <!-- Concat hibernate.cfg.xml -->
- <concat destfile="${project.build.directory}/classes/hibernate.cfg.@{database}.xml">
- <header trimleading="yes"><![CDATA[<?xml version='1.0' encoding='utf-8'?>
-
- <!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
- <hibernate-configuration>
- <session-factory>
- ]]></header>
- <fileset file="${project.resources.directory}/hibernate.common.xml" />
- <fileset file="${project.resources.directory}/hibernate.properties.@{database}.xml" />
- <fileset file="${project.resources.directory}/hibernate.mapping.xml" />
- <fileset file="${project.resources.directory}/hibernate.cache.xml" />
- <footer trimleading="yes"><![CDATA[
- </session-factory>
- </hibernate-configuration>
- ]]></footer>
- </concat>
- </sequential>
- </macrodef>
-
- <target name="concat">
-
- <macro-database-cfg database="hsqldb"/>
- <macro-database-cfg database="mysql"/>
- <macro-database-cfg database="postgresql"/>
-
- <echo message="Copy hibernate.cfg.${database}.xml to hibernate.cfg.xml" />
- <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml" tofile="${project.build.directory}/classes/hibernate.cfg.xml"/>
- </target>
-</project>
\ No newline at end of file
Modified: jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml 2008-09-04 18:12:56 UTC (rev 2114)
@@ -10,11 +10,7 @@
<directory>${project.build.outputDirectory}</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>hibernate.cfg.xml</include>
- <include>hibernate.cfg.*.xml</include>
<include>jbpm.cfg.xml</include>
- <include>jbpm.mail.templates.xml</include>
- <include>tree.cache.xml</include>
</includes>
</fileSet>
</fileSets>
Modified: jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/ejb/impl/CommandServiceBean.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/ejb/impl/CommandServiceBean.java 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/ejb/impl/CommandServiceBean.java 2008-09-04 18:12:56 UTC (rev 2114)
@@ -63,7 +63,7 @@
* </td>
* </tr>
* <tr>
- * <td><code>ejb/LocalTimerEntityBean</code></td>
+ * <td><code>ejb/TimerEntityBean</code></td>
* <td>EJB Reference</td>
* <td>Link to the local {@linkplain TimerEntityBean entity bean} that
* implements the scheduler service. Required for processes that contain
Modified: jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EntitySchedulerServiceFactory.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EntitySchedulerServiceFactory.java 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/enterprise/src/main/java/org/jbpm/scheduler/ejbtimer/EntitySchedulerServiceFactory.java 2008-09-04 18:12:56 UTC (rev 2114)
@@ -33,7 +33,7 @@
private static final long serialVersionUID = 1L;
- String timerEntityHomeJndiName = "java:comp/env/ejb/LocalTimerEntityBean";
+ String timerEntityHomeJndiName = "java:comp/env/ejb/TimerEntityBean";
private LocalTimerEntityHome timerEntityHome;
Modified: jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/ejb-jar.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/ejb-jar.xml 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/META-INF/ejb-jar.xml 2008-09-04 18:12:56 UTC (rev 2114)
@@ -37,7 +37,7 @@
Link to the local entity bean that implements the scheduler service. Required for
processes that contain timers.
</description>
- <ejb-ref-name>ejb/LocalTimerEntityBean</ejb-ref-name>
+ <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
<local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home>
<local>org.jbpm.ejb.LocalTimerEntity</local>
Deleted: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.cache.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.cache.xml 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.cache.xml 2008-09-04 18:12:56 UTC (rev 2114)
@@ -1,67 +0,0 @@
-
- <!-- ################################### -->
- <!-- # 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" />
-
- <!--
- ==================================================================================
- END org.jboss.jbpm:jbpm-jpdl-core hibernate.cfg.xml
- ==================================================================================
- -->
Deleted: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.common.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.common.xml 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.common.xml 2008-09-04 18:12:56 UTC (rev 2114)
@@ -1,24 +0,0 @@
-
- <!-- ################################### -->
- <!-- # common settings # -->
- <!-- ################################### -->
-
- <!-- Simple memory-only cache -->
- <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-
- <!-- DataSource properties -->
- <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDataSource</property>
-
- <!-- JTA transaction properties -->
- <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
- <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
-
- <!-- CMT transaction properties
- <property name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property>
- <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
- -->
-
- <!-- logging properties -->
- <property name="hibernate.format_sql">true</property>
- <property name="hibernate.use_sql_comments">true</property>
-
\ No newline at end of file
Deleted: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.mapping.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.mapping.xml 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.mapping.xml 2008-09-04 18:12:56 UTC (rev 2114)
@@ -1,149 +0,0 @@
-
- <!-- ############################################ -->
- <!-- # mapping files with external dependencies # -->
- <!-- ############################################ -->
-
- <!-- following mapping files have a dependency on the JCR API -->
- <!--
- <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/>
- -->
-
- <!-- ###################### -->
- <!-- # 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.html -->
- <!--
- <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.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Transition.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.hbm.xml"/>
- <mapping resource="org/jbpm/instantiation/Delegation.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.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.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.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.hbm.xml"/>
-
- <!-- job mapping files -->
- <mapping resource="org/jbpm/job/Job.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"/>
-
- <!-- taskmgmt.exe mapping files -->
- <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.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.hbm.xml"/>
- <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ActionLog.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.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"/>
Deleted: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.hsqldb.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.hsqldb.xml 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.hsqldb.xml 2008-09-04 18:12:56 UTC (rev 2114)
@@ -1,3 +0,0 @@
-
- <!-- hibernate dialect -->
- <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
Deleted: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.mysql.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.mysql.xml 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.mysql.xml 2008-09-04 18:12:56 UTC (rev 2114)
@@ -1,3 +0,0 @@
-
- <!-- hibernate dialect -->
- <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
Deleted: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.postgresql.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.postgresql.xml 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.postgresql.xml 2008-09-04 18:12:56 UTC (rev 2114)
@@ -1,3 +0,0 @@
-
- <!-- hibernate dialect -->
- <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
Modified: jbpm3/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml 2008-09-04 18:12:56 UTC (rev 2114)
@@ -9,30 +9,11 @@
<service name="authentication" factory="org.jbpm.security.authentication.DefaultAuthenticationServiceFactory" />
</jbpm-context>
- <!-- configuration property used by persistence service impl org.jbpm.persistence.db.DbPersistenceServiceFactory -->
- <string name="resource.hibernate.cfg.xml" value="hibernate.cfg.xml" />
-
- <!-- configuration resource files pointing to default configuration files in jbpm-jpdl.jar -->
- <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties" />
- <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties" />
- <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties" />
- <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml" />
- <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml" />
- <string name="resource.parsers" value="org/jbpm/jpdl/par/jbpm.parsers.xml" />
- <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml" />
- <string name="resource.mail.templates" value="jbpm.mail.templates.xml" />
-
- <int name="jbpm.byte.block.size" value="1024" singleton="true" />
- <string name="jbpm.mail.smtp.host" value="localhost" />
- <bean name="jbpm.task.instance.factory" class="org.jbpm.taskmgmt.impl.DefaultTaskInstanceFactoryImpl" singleton="true" />
- <bean name="jbpm.variable.resolver" class="org.jbpm.jpdl.el.impl.JbpmVariableResolver" singleton="true" />
- <bean name="jbpm.mail.address.resolver" class="org.jbpm.identity.mail.IdentityAddressResolver" singleton="true" />
-
<!--
Note, that the default job executor needs to be overwritten with a null value.
In the enterprise configuration there should be no job executor.
Async messaging is there bound to jms and timers to ejb timers.
-->
<null name="jbpm.job.executor" />
-
+
</jbpm-configuration>
Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java 2008-09-04 18:12:56 UTC (rev 2114)
@@ -49,7 +49,6 @@
protected void setUp() throws Exception {
jbpmConfiguration = JbpmConfiguration.getInstance();
- getUserTransaction();
}
public void testUserTx() throws Exception {
Modified: jbpm3/trunk/modules/jpdl/userguide/src/main/doocbook/en/modules/enterprise.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/userguide/src/main/doocbook/en/modules/enterprise.xml 2008-09-04 17:40:29 UTC (rev 2113)
+++ jbpm3/trunk/modules/jpdl/userguide/src/main/doocbook/en/modules/enterprise.xml 2008-09-04 18:12:56 UTC (rev 2114)
@@ -37,7 +37,7 @@
</entry>
</row>
<row>
- <entry><literal>ejb/LocalTimerEntityBean</literal></entry>
+ <entry><literal>ejb/TimerEntityBean</literal></entry>
<entry>EJB Reference</entry>
<entry>Link to the local entity bean that implements the scheduler service.
Required for processes that contain timers.
@@ -280,7 +280,7 @@
<itemizedlist>
<listitem><literal>timerEntityHomeJndiName</literal>: the name of the
<literal>TimerEntityBean</literal>'s local home interface in the JNDI initial context.
- Defaults to <literal>java:comp/env/ejb/LocalTimerEntityBean</literal>.
+ Defaults to <literal>java:comp/env/ejb/TimerEntityBean</literal>.
</listitem>
</itemizedlist>
@@ -388,7 +388,7 @@
<transaction-type>Container</transaction-type>
<ejb-local-ref>
- <ejb-ref-name>ejb/LocalTimerEntityBean</ejb-ref-name>
+ <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
<local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home>
<local>org.jbpm.ejb.LocalTimerEntity</local>
@@ -426,7 +426,7 @@
<local-jndi-name>java:ejb/MyClientBean</local-jndi-name>
<ejb-local-ref>
- <ejb-ref-name>ejb/LocalTimerEntityBean</ejb-ref-name>
+ <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
<local-jndi-name>java:ejb/TimerEntityBean</local-jndi-name>
</ejb-local-ref>
@@ -463,7 +463,7 @@
</servlet-mapping>
<ejb-local-ref>
- <ejb-ref-name>ejb/LocalTimerEntityBean</ejb-ref-name>
+ <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
<local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home>
<local>org.jbpm.ejb.LocalTimerEntity</local>
@@ -498,7 +498,7 @@
<programlisting><![CDATA[<jboss-web>
<ejb-local-ref>
- <ejb-ref-name>ejb/LocalTimerEntityBean</ejb-ref-name>
+ <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
<local-jndi-name>java:ejb/TimerEntityBean</local-jndi-name>
</ejb-local-ref>
More information about the jbpm-commits
mailing list