[jbpm-commits] JBoss JBPM SVN: r3144 - in jbpm4/trunk/modules: api and 26 other directories.

Author: tom.baeyens(a)jboss.com Date: 2008-11-28 06:20:28 -0500 (Fri, 28 Nov 2008) New Revision: 3144 Added: jbpm4/trunk/modules/distro/src/main/resources/readme.html jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.wire.bindings.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.business.calendar.properties jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.cache.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.definition.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.execution.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.job.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.typedefs.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.types.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.variable.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml jbpm4/trunk/modules/pvm/src/test/resources/jbpm.user.bindings.xml Removed: jbpm4/trunk/modules/distro/src/main/resources/release.notes.html jbpm4/trunk/modules/jpdl/src/main/resources/org/ jbpm4/trunk/modules/manual/ jbpm4/trunk/modules/pvm/src/main/resources/org.jbpm.api.client.Configuration jbpm4/trunk/modules/pvm/src/main/resources/org/ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/pvm.wire.bindings.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm.wire.bindings.xml Modified: jbpm4/trunk/modules/api/pom.xml jbpm4/trunk/modules/api/src/main/resources/cfg.xsd jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml jbpm4/trunk/modules/distro/assembly-distro-package.xml jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/DeployerManagerBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/spring/spring.beans.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/langext/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/type/environmentCustomTypes.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/task/src/test/resources/org.jbpm.task.cfg.xml jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml Log: JBPM-1893 : reorganised resources Modified: jbpm4/trunk/modules/api/pom.xml =================================================================== --- jbpm4/trunk/modules/api/pom.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/api/pom.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -87,9 +87,9 @@ <configuration> <tasks> <echo message="basedir: ${basedir}" /> - <mkdir dir="target/schemadoc" /> + <mkdir dir="target/schemadocs" /> <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" classpathref="maven.plugin.classpath" /> - <xsddoc out="${basedir}/target/schemadoc" title="jBPM 4 Schema's" verbose="false"> + <xsddoc out="${basedir}/target/schemadocs" title="jBPM 4 Schema's" verbose="false"> <fileset dir="src/main/resources" /> </xsddoc> </tasks> Modified: jbpm4/trunk/modules/api/src/main/resources/cfg.xsd =================================================================== --- jbpm4/trunk/modules/api/src/main/resources/cfg.xsd 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/api/src/main/resources/cfg.xsd 2008-11-28 11:20:28 UTC (rev 3144) @@ -167,12 +167,6 @@ <annotation><documentation>Specifies when and how this object should be created and initialized. Default is lazy.</documentation></annotation> </attribute> - <attribute name="resource" type="string"> - <annotation><documentation>Imports contents of the document element - of all resource files (using deep scan ClassLoader.getResources(String)) - as content into this element. - </documentation></annotation> - </attribute> </complexType> </element> @@ -960,19 +954,6 @@ <complexType name="hibernateConfigurationType"> <choice minOccurs="0" maxOccurs="unbounded"> - <element name="mappings"> - <annotation><documentation>Imports mapping file references from the - referenced resource files</documentation></annotation> - <complexType> - <attribute name="resource" type="string"> - <annotation><documentation>Import mapping references from a resource file. - The full classpath is scanned for all the resource - files of the given name. All mapping elements that are found as the content in - the top level document element will be imported for all of the resource files - found on the classpath with that name. </documentation></annotation> - </attribute> - </complexType> - </element> <element name="mapping"> <annotation><documentation>Imports a hibernate mapping file</documentation></annotation> <complexType> Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch02-ExecutionModes.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -126,15 +126,21 @@ &lt;hibernate-configuration&gt; &lt;properties resource=&quot;hibernate.properties&quot; /&gt; - &lt;mappings resource=&quot;org/jbpm/pvm/pvm.hibernate.mappings.xml&quot; /&gt; - &lt;cache-configuration resource=&quot;org/jbpm/pvm/pvm.cache.xml&quot; + &lt;mapping resource=&quot;jbpm.pvm.typedefs.hbm.xml&quot; /&gt; + &lt;mapping resource=&quot;jbpm.pvm.wire.hbm.xml&quot; /&gt; + &lt;mapping resource=&quot;jbpm.pvm.definition.hbm.xml&quot; /&gt; + &lt;mapping resource=&quot;jbpm.pvm.execution.hbm.xml&quot; /&gt; + &lt;mapping resource=&quot;jbpm.pvm.variable.hbm.xml&quot; /&gt; + &lt;mapping resource=&quot;jbpm.pvm.job.hbm.xml&quot; /&gt; + &lt;mapping resource=&quot;jbpm.jpdl.hbm.xml&quot; /&gt; + &lt;cache-configuration resource=&quot;jbpm.pvm.cache.xml&quot; usage=&quot;nonstrict-read-write&quot; /&gt; &lt;/hibernate-configuration&gt; &lt;hibernate-session-factory /&gt; &lt;id-generator /&gt; - &lt;variable-types resource=&quot;org/jbpm/pvm/pvm.types.xml&quot; /&gt; + &lt;variable-types resource=&quot;jbpm.pvm.types.xml&quot; /&gt; &lt;job-executor auto-start=&quot;false&quot; /&gt; &lt;/process-engine&gt; Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/chxx-Persistence.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -11,21 +11,26 @@ 03 | &lt;process-engine&gt; 04 |<emphasis role="bold"> &lt;hibernate-session-factory /&gt;</emphasis> 05 |<emphasis role="bold"> &lt;hibernate-configuration&gt;</emphasis> -06 |<emphasis role="bold"> &lt;properties resource="hibernate.properties" /&gt;</emphasis> -07 |<emphasis role="bold"> &lt;mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /&gt;</emphasis> -08 |<emphasis role="bold"> &lt;cache-configuration </emphasis> -09 |<emphasis role="bold"> resource="org/jbpm/pvm/pvm.cache.xml" </emphasis> -10 |<emphasis role="bold"> usage="nonstrict-read-write" /&gt;</emphasis> -11 |<emphasis role="bold"> &lt;/hibernate-configuration&gt;</emphasis> -12 | &lt;/process-engine&gt; -13 | -14 | &lt;block&gt; -15 |<emphasis role="bold"> &lt;standard-transaction /&gt;</emphasis> -16 |<emphasis role="bold"> &lt;hibernate-session /&gt;</emphasis> -17 |<emphasis role="bold"> &lt;pvm-db-session /&gt;</emphasis> -18 | &lt;/block&gt; -19 | -20 | &lt;/jbpm-configuration&gt;</programlisting> +06 |<emphasis role="bold"> &lt;properties resource=&quot;hibernate.properties&quot; /&gt;</emphasis> +07 |<emphasis role="bold"> &lt;mapping resource=&quot;jbpm.pvm.typedefs.hbm.xml&quot; /&gt;</emphasis> +08 |<emphasis role="bold"> &lt;mapping resource=&quot;jbpm.pvm.wire.hbm.xml&quot; /&gt;</emphasis> +09 |<emphasis role="bold"> &lt;mapping resource=&quot;jbpm.pvm.definition.hbm.xml&quot; /&gt;</emphasis> +10 |<emphasis role="bold"> &lt;mapping resource=&quot;jbpm.pvm.execution.hbm.xml&quot; /&gt;</emphasis> +11 |<emphasis role="bold"> &lt;mapping resource=&quot;jbpm.pvm.variable.hbm.xml&quot; /&gt;</emphasis> +12 |<emphasis role="bold"> &lt;mapping resource=&quot;jbpm.pvm.job.hbm.xml&quot; /&gt;</emphasis> +13 |<emphasis role="bold"> &lt;mapping resource=&quot;jbpm.jpdl.hbm.xml&quot; /&gt;</emphasis> +14 |<emphasis role="bold"> &lt;cache-configuration resource=&quot;jbpm.pvm.cache.xml&quot;</emphasis> +15 |<emphasis role="bold"> usage=&quot;nonstrict-read-write&quot; /&gt;</emphasis> +16 |<emphasis role="bold"> &lt;/hibernate-configuration&gt;</emphasis> +17 | &lt;/process-engine&gt; +18 | +19 | &lt;environment&gt; +20 |<emphasis role="bold"> &lt;standard-transaction /&gt;</emphasis> +21 |<emphasis role="bold"> &lt;hibernate-session /&gt;</emphasis> +22 |<emphasis role="bold"> &lt;pvm-db-session /&gt;</emphasis> +23 | &lt;/environment&gt; +24 | +25 | &lt;/jbpm-configuration&gt;</programlisting> <para><literal>line 04</literal> specifies a hibernate session factory in the process-engine context. This means that a hibernate session factory is lazy created when it is first needed and cached in the @@ -40,30 +45,20 @@ <para><literal>line 06</literal> specifies the that the resource file <literal>hibernate.properties</literal> should be loaded into the configuration. </para> - <para><literal>line 07</literal> (note the plural form of mapping<emphasis role="bold">s</emphasis>) - specifies that resources <literal>org/jbpm/pvm/pvm.hibernate.mappings.xml</literal> contain references - to hibernate mapping files or resources that should be included into the - configuration. Also note the plural form of <literal>resources</literal>. - This means that not one, but all the resource files on the whole classpath will be found. - This way new library components containing a <literal>org/jbpm/pvm/pvm.hibernate.mappings.xml</literal> - resource can plug automatically into the same hibernate session by just being added to - the classpath. + <para><literal>line 07 - 13</literal> specifies the mapping resources files. </para> - <para>Alternatively, individual hibernate mapping files can be referenced with the - singular <literal>mapping</literal> element. - </para> - <para><literal>line 08 - 10</literal> provide a single place to specify the + <para><literal>line 14 - 15</literal> provide a single place to specify the hibernate caching strategy for all the PVM classes and collections. </para> - <para><literal>line 15</literal> specifies a standard transaction. This is + <para><literal>line 20</literal> specifies a standard transaction. This is a very simple global transaction strategy without recovery that can be used in standard environments to get all-or-nothing semantics over multiple transactional resources. </para> - <para><literal>line 16</literal> specifies the hibernate session that will + <para><literal>line 21</literal> specifies the hibernate session that will automatically register itself with the standard transaction. </para> - <para><literal>line 17</literal> specifies a <literal>PvmDbSession</literal>. + <para><literal>line 22</literal> specifies a <literal>PvmDbSession</literal>. That is a class that adds methods that bind to specific queries to be executed on the hibernate session. </para> @@ -130,12 +125,18 @@ it and add it to the configuration like this: </para> <programlisting>&lt;hibernate-configuration&gt; - &lt;properties resource="hibernate.properties" /&gt; - &lt;mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /&gt; + &lt;properties resource=&quot;hibernate.properties&quot; /&gt; + &lt;mapping resource=&quot;jbpm.pvm.typedefs.hbm.xml&quot; /&gt; + &lt;mapping resource=&quot;jbpm.pvm.wire.hbm.xml&quot; /&gt; + &lt;mapping resource=&quot;jbpm.pvm.definition.hbm.xml&quot; /&gt; + &lt;mapping resource=&quot;jbpm.pvm.execution.hbm.xml&quot; /&gt; + &lt;mapping resource=&quot;jbpm.pvm.variable.hbm.xml&quot; /&gt; + &lt;mapping resource=&quot;jbpm.pvm.job.hbm.xml&quot; /&gt; + &lt;mapping resource=&quot;jbpm.jpdl.hbm.xml&quot; /&gt; <emphasis role="bold">&lt;mapping resource="org/jbpm/examples/ch09/state.hbm.xml" /&gt;</emphasis> - &lt;cache-configuration - resource="org/jbpm/pvm/pvm.cache.xml" - usage="nonstrict-read-write" /&gt;</programlisting> + &lt;cache-configuration resource=&quot;jbpm.pvm.cache.xml&quot; + usage=&quot;nonstrict-read-write&quot; /&gt; +&lt;/hibernate-configuration&gt;</programlisting> <para>The next code pieces show the contents of one unit test method. The method will first create the environment factory. Then, in a first transaction, a process definition will be created and saved into the database. Then the next transaction will Modified: jbpm4/trunk/modules/distro/assembly-distro-package.xml =================================================================== --- jbpm4/trunk/modules/distro/assembly-distro-package.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/distro/assembly-distro-package.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -67,35 +67,35 @@ </fileSet> <fileSet> <directory>../api/src/main/java</directory> - <outputDirectory>src/api</outputDirectory> + <outputDirectory>src</outputDirectory> </fileSet> <fileSet> <directory>../api/src/main/resources</directory> - <outputDirectory>src/api</outputDirectory> + <outputDirectory>src</outputDirectory> </fileSet> <fileSet> <directory>../log/src/main/java</directory> - <outputDirectory>src/impl</outputDirectory> + <outputDirectory>src</outputDirectory> </fileSet> <fileSet> <directory>../pvm/src/main/java</directory> - <outputDirectory>src/impl</outputDirectory> + <outputDirectory>src</outputDirectory> </fileSet> <fileSet> <directory>../pvm/src/main/resources</directory> - <outputDirectory>src/impl</outputDirectory> + <outputDirectory>src</outputDirectory> </fileSet> <fileSet> <directory>../jpdl/src/main/java</directory> - <outputDirectory>src/impl</outputDirectory> + <outputDirectory>src</outputDirectory> </fileSet> <fileSet> <directory>../jpdl/src/main/resources</directory> - <outputDirectory>src/impl</outputDirectory> + <outputDirectory>src</outputDirectory> </fileSet> <fileSet> <directory>../test-base/src/main/java</directory> - <outputDirectory>src/impl</outputDirectory> + <outputDirectory>src</outputDirectory> </fileSet> <fileSet> <directory>../test-db/src/test/resources</directory> Copied: jbpm4/trunk/modules/distro/src/main/resources/readme.html (from rev 3138, jbpm4/trunk/modules/distro/src/main/resources/release.notes.html) =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/readme.html (rev 0) +++ jbpm4/trunk/modules/distro/src/main/resources/readme.html 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,36 @@ +<html> + <head> + <title>jBPM 4 readme</title> + </head> + <body> + <h1>Docs</h1> + + <table> + <tr> + <th>Link</th> + <th>Description</th> + </tr> + <tr> + <td><a href="doc/userguide/html_single/index.html">User guide</a></td> + <td>Userguide docs describing the stable and supported ways of how to work with jBPM.</td> + </tr> + <tr> + <td><a href="doc/javadocs/index.html">Javadocs</a></td> + <td>Javadocs describing the stable and supported API</td> + </tr> + <tr> + <td><a href="doc/schemadocs/index.html">Schemadocs</a></td> + <td>Javadoc-like documentation of the jPDL XML schema and the jBPM configuration file XML schema</td> + </tr> + <tr> + <td><a href="doc/devguide/html_single/index.html">Developers guide</a></td> + <td>Describes more configuration, usage and tweaking options. + Unleash all the flexibility in jBPM. But beware, the parts documented in this dev + guide are not guaranteed to be forward compatible.</td> + </tr> + </table> + + <h1>Release notes for jBPM 4.0.0.Alpha1</h1> + <p>Finally.. phew !</p> + </body> +</html> Property changes on: jbpm4/trunk/modules/distro/src/main/resources/readme.html ___________________________________________________________________ Name: svn:mergeinfo + Deleted: jbpm4/trunk/modules/distro/src/main/resources/release.notes.html =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/release.notes.html 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/distro/src/main/resources/release.notes.html 2008-11-28 11:20:28 UTC (rev 3144) @@ -1,9 +0,0 @@ -<html> - <head> - <title>jBPM 4 release notes</title> - </head> - <body> - <h1>jBPM 4.0.0.Alpha1</h1> - <p>Finally.. phew !</p> - </body> -</html> Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-11-28 11:20:28 UTC (rev 3144) @@ -21,6 +21,7 @@ */ package org.jbpm.jpdl.xml; +import java.io.InputStream; import java.net.URL; import java.util.ArrayList; import java.util.Enumeration; @@ -35,7 +36,6 @@ import org.jbpm.pvm.internal.util.ReflectUtil; import org.jbpm.pvm.internal.util.UrlEntity; import org.jbpm.pvm.internal.util.XmlUtil; -import org.jbpm.pvm.internal.xml.Binding; import org.jbpm.pvm.internal.xml.Bindings; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; @@ -48,6 +48,12 @@ private static final Log log = Log.getLog(JpdlParser.class.getName()); + public static final String[] DEFAULT_ACTIVITIES_RESOURCES = new String[]{ + "jbpm.jpdl.activities.xml", + "jbpm.user.activities.xml" + }; + + private static Bindings defaultBindings; // initialized at the bottom of this file public JpdlParser() { @@ -176,18 +182,20 @@ ActivityParser activityParser = new ActivityParser(); - Enumeration<URL> enumeration = ReflectUtil.getResources(null, "org/jbpm/jpdl/jpdl.activities.xml"); - if (enumeration!=null) { - while (enumeration.hasMoreElements()) { - URL url = enumeration.nextElement(); - log.trace("parsing jpdl activities from resource url: "+url); + for (String activityResource: DEFAULT_ACTIVITIES_RESOURCES) { + InputStream inputStream = ReflectUtil.getResourceAsStream(null, activityResource); + if (inputStream!=null) { + log.trace("parsing jpdl activities from resource: "+activityResource); activityParser.createParse() - .setUrl(url) + .setInputStream(inputStream) .pushObject(defaultBindings) .execute() - .checkProblems("default wire bindings"); + .checkProblems("jpdl activities from resource "+activityResource); + } else { + log.trace("skipping unavailable jpdl activities resource: "+activityResource); } + } } } Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml (from rev 3138, jbpm4/trunk/modules/jpdl/src/main/resources/org/jbpm/jpdl/jpdl.activities.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,6 @@ +<activities> + <activity binding="org.jbpm.jpdl.xml.StartBinding" /> + <activity binding="org.jbpm.jpdl.xml.StateBinding" /> + <activity binding="org.jbpm.jpdl.xml.ExclusiveBinding" /> + <activity binding="org.jbpm.jpdl.xml.EndBinding" /> +</activities> \ No newline at end of file Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml (from rev 3138, jbpm4/trunk/modules/jpdl/src/main/resources/org/jbpm/jpdl/hibernate.jpdl.hbm.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,27 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping default-access="field"> + + <joined-subclass name="org.jbpm.jpdl.JpdlProcessDefinition" table="JBPM_JPDL_PROCDEF" extends="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"> + <key column="DBID_"/> + </joined-subclass> + + <joined-subclass name="org.jbpm.jpdl.JpdlExecution" table="JBPM_JPDL_EXECUTION" extends="org.jbpm.pvm.internal.model.ExecutionImpl"> + <key column="DBID_"/> + </joined-subclass> + + <class name="org.jbpm.jpdl.activity.JpdlActivity" table="JBPM_JPDL_ACTIVITY" abstract="true" discriminator-value="X"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_" /> + <subclass name="org.jbpm.jpdl.activity.StartActivity" discriminator-value="start" /> + <subclass name="org.jbpm.jpdl.activity.ExclusiveConditionActivity" discriminator-value="excl-cond" /> + <subclass name="org.jbpm.jpdl.activity.ExclusiveExpressionActivity" discriminator-value="excl-expr" /> + <subclass name="org.jbpm.jpdl.activity.ExclusiveHandlerActivity" discriminator-value="excl-handler" /> + <subclass name="org.jbpm.jpdl.activity.StateActivity" discriminator-value="state" /> + <subclass name="org.jbpm.jpdl.activity.EndActivity" discriminator-value="end" /> + </class> + +</hibernate-mapping> \ No newline at end of file Property changes on: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.wire.bindings.xml (from rev 3138, jbpm4/trunk/modules/jpdl/src/main/resources/org/jbpm/pvm/pvm.wire.bindings.xml) =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.wire.bindings.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.wire.bindings.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,3 @@ +<wire-bindings> + <binding class="org.jbpm.jpdl.xml.ParseJpdlBinding" /> +</wire-bindings> Property changes on: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.wire.bindings.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -25,8 +25,14 @@ <hibernate-configuration> <properties resource="hibernate.properties" /> - <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /> - <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" usage="nonstrict-read-write" /> </hibernate-configuration> @@ -36,7 +42,7 @@ <job-test-helper /> <id-generator /> - <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> + <variable-types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/> Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateJobDbSession.java 2008-11-28 11:20:28 UTC (rev 3144) @@ -35,7 +35,7 @@ public class HibernateJobDbSession extends HibernateDbSession implements JobDbSession { public JobImpl<?> findFirstAcquirableJob() { - // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.job.hbm.xml + // query definition can be found at the bottom of resource jbpm.pvm.job.hbm.xml Query query = session.getNamedQuery("findFirstAcquirableJob"); query.setTimestamp("now", Clock.getCurrentTime()); query.setMaxResults(1); @@ -43,7 +43,7 @@ } public List<JobImpl<?>> findExclusiveJobs(Execution processInstance) { - // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.job.hbm.xml + // query definition can be found at the bottom of resource jbpm.pvm.job.hbm.xml Query query = session.getNamedQuery("findExclusiveJobs"); query.setTimestamp("now", Clock.getCurrentTime()); query.setEntity("processInstance", processInstance); @@ -51,7 +51,7 @@ } public JobImpl<?> findFirstDueJob() { - // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.job.hbm.xml + // query definition can be found at the bottom of resource jbpm.pvm.job.hbm.xml Query query = session.getNamedQuery("findFirstDueJob"); query.setMaxResults(1); return (JobImpl<?>) query.uniqueResult(); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernatePvmDbSession.java 2008-11-28 11:20:28 UTC (rev 3144) @@ -46,19 +46,19 @@ } public List<String> findProcessDefinitionNames() { - // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.definition.hbm.xml + // query definition can be found at the bottom of resource jbpm.pvm.definition.hbm.xml return session.getNamedQuery("findProcessDefinitionNames").list(); } public List<ClientProcessDefinition> findProcessDefinitionsByName(String name) { - // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.definition.hbm.xml + // query definition can be found at the bottom of resource jbpm.pvm.definition.hbm.xml Query query = session.getNamedQuery("findProcessDefinitionsByName"); query.setString("name", name); return query.list(); } public ClientProcessDefinition findProcessDefinitionByName(String name, int version) { - // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.definition.hbm.xml + // query definition can be found at the bottom of resource jbpm.pvm.definition.hbm.xml Query query = session.getNamedQuery("findProcessDefinitionByNameAndVersion"); query.setString("name", name); query.setInteger("version", version); @@ -67,7 +67,7 @@ } public ClientProcessDefinition findLatestProcessDefinitionByName(String name) { - // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.definition.hbm.xml + // query definition can be found at the bottom of resource jbpm.pvm.definition.hbm.xml Query query = session.getNamedQuery("findProcessDefinitionsByName"); query.setString("name", name); query.setMaxResults(1); @@ -76,7 +76,7 @@ } public ClientProcessDefinition findProcessDefinitionById(String processDefinitionId) { - // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.definition.hbm.xml + // query definition can be found at the bottom of resource jbpm.pvm.definition.hbm.xml Query query = session.getNamedQuery("findProcessDefinitionsById"); query.setString("id", processDefinitionId); query.setMaxResults(1); @@ -85,7 +85,7 @@ } public ClientExecution findExecutionById(String executionId) { - // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.execution.hbm.xml + // query definition can be found at the bottom of resource jbpm.pvm.execution.hbm.xml Query query = session.getNamedQuery("findExecutionById"); query.setString("id", executionId); query.setMaxResults(1); @@ -93,7 +93,7 @@ } public Execution findExecutionByKey(String processDefinitionName, String executionKey) { - // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.execution.hbm.xml + // query definition can be found at the bottom of resource jbpm.pvm.execution.hbm.xml Query query = session.getNamedQuery("findExecutionByKey"); query.setString("processDefinitionName", processDefinitionName); query.setString("executionKey", executionKey); @@ -102,7 +102,7 @@ } public List<Timer> findTimers(int firstResult, int maxResults) { - // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.job.hbm.xml + // query definition can be found at the bottom of resource jbpm.pvm.job.hbm.xml Query query = session.getNamedQuery("findTimers"); query.setFirstResult(firstResult); query.setMaxResults(maxResults); @@ -110,7 +110,7 @@ } public List<Message> findMessages(int firstResult, int maxResults) { - // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.job.hbm.xml + // query definition can be found at the bottom of resource jbpm.pvm.job.hbm.xml Query query = session.getNamedQuery("findMessages"); query.setFirstResult(firstResult); query.setMaxResults(maxResults); @@ -118,7 +118,7 @@ } public List<Job> findJobsWithException(int firstResult, int maxResults) { - // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.job.hbm.xml + // query definition can be found at the bottom of resource jbpm.pvm.job.hbm.xml Query query = session.getNamedQuery("findJobsWithException"); query.setFirstResult(firstResult); query.setMaxResults(maxResults); @@ -126,7 +126,7 @@ } public List<String> findProcessInstanceIds(String processDefinitionId) { - // query definition can be found at the bottom of resource org/jbpm/pvm/hibernate.job.hbm.xml + // query definition can be found at the bottom of resource jbpm.pvm.job.hbm.xml Query query = session.getNamedQuery("findProcessInstanceIds"); query.setString("processDefinitionId", processDefinitionId); return query.list(); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/DeployerManagerBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/DeployerManagerBinding.java 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/DeployerManagerBinding.java 2008-11-28 11:20:28 UTC (rev 3144) @@ -56,22 +56,6 @@ public Object parse(Element element, Parse parse, Parser parser) { DeployerManagerDescriptor descriptor = new DeployerManagerDescriptor(); - if (element.hasAttribute("resource")) { - String resource = element.getAttribute("resource"); - try { - Enumeration<URL> enumeration = ReflectUtil.getResources(parse.getClassLoader(), resource); - if (enumeration!=null) { - while (enumeration.hasMoreElements()) { - URL url = enumeration.nextElement(); - log.trace("importing language deployers from "+url); - parser.importStream(new UrlStreamSource(url), element, parse); - } - } - } catch (Exception e) { - parse.addProblem("couldn't parse language deployer resource '"+resource+"'", e); - } - } - List<Element> languageElements = XmlUtil.elements(element, "language"); if (languageElements!=null) { for (Element languageElement: languageElements) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/WireParser.java 2008-11-28 11:20:28 UTC (rev 3144) @@ -1,5 +1,6 @@ package org.jbpm.pvm.internal.wire.xml; +import java.io.InputStream; import java.net.URL; import java.util.ArrayList; import java.util.Enumeration; @@ -126,7 +127,11 @@ */ public class WireParser extends Parser { - public static final String PVM_WIRE_BINDINGS_RESOURCES = "org/jbpm/pvm/pvm.wire.bindings.xml"; + public static final String[] DEFAULT_WIRE_BINDING_RESOURCES = new String[]{ + "jbpm.pvm.wire.bindings.xml", + "jbpm.jpdl.wire.bindings.xml", + "jbpm.user.wire.bindings.xml" + }; private static final long serialVersionUID = 1L; @@ -292,18 +297,18 @@ defaultBindings = new Bindings(); BindingParser bindingParser = new BindingParser(); - - Enumeration<URL> enumeration = ReflectUtil.getResources(null, PVM_WIRE_BINDINGS_RESOURCES); - if (enumeration!=null) { - while (enumeration.hasMoreElements()) { - URL url = enumeration.nextElement(); - log.trace("parsing bindings from resource url: "+url); - + + for (String wireResource: DEFAULT_WIRE_BINDING_RESOURCES) { + InputStream inputStream = ReflectUtil.getResourceAsStream(null, wireResource); + if (inputStream!=null) { + log.trace("loading wire bindings from resource: "+wireResource); bindingParser.createParse() - .setUrl(url) - .pushObject(defaultBindings) - .execute() - .checkProblems("default wire bindings"); + .setInputStream(inputStream) + .pushObject(defaultBindings) + .execute() + .checkProblems("default wire bindings"); + } else { + log.trace("skipping unavailable wire bindings resource "+wireResource); } } } Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.business.calendar.properties (from rev 3138, jbpm4/trunk/modules/pvm/src/main/resources/org/jbpm/pvm/internal/cal/jbpm.business.calendar.properties) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.business.calendar.properties (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.business.calendar.properties 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,36 @@ +hour.format=HH:mm +#weekday ::= [<daypart> [& <daypart>]*] +#daypart ::= <start-hour>-<to-hour> +#start-hour and to-hour must be in the hour.format +#dayparts have to be ordered +weekday.monday= 9:00-12:00 & 12:30-17:00 +weekday.thuesday= 9:00-12:00 & 12:30-17:00 +weekday.wednesday= 9:00-12:00 & 12:30-17:00 +weekday.thursday= 9:00-12:00 & 12:30-17:00 +weekday.friday= 9:00-12:00 & 12:30-17:00 +weekday.saturday= +weekday.sunday= + +day.format=dd/MM/yyyy +# holiday syntax: <holiday> +# holiday period syntax: <start-day>-<end-day> +# below are the belgian official holidays +holiday.1= 01/01/2005 # nieuwjaar +holiday.2= 27/3/2005 # pasen +holiday.3= 28/3/2005 # paasmaandag +holiday.4= 1/5/2005 # feest van de arbeid +holiday.5= 5/5/2005 # hemelvaart +holiday.6= 15/5/2005 # pinksteren +holiday.7= 16/5/2005 # pinkstermaandag +holiday.8= 21/7/2005 # my birthday +holiday.9= 15/8/2005 # moederkesdag +holiday.10= 1/11/2005 # allerheiligen +holiday.11= 11/11/2005 # wapenstilstand +holiday.12= 25/12/2005 # kerstmis + + +business.day.expressed.in.hours= 8 +business.week.expressed.in.hours= 40 +business.month.expressed.in.business.days= 21 +business.year.expressed.in.business.days= 220 + Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.business.calendar.properties ___________________________________________________________________ Name: svn:mergeinfo + Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.cache.xml (from rev 3138, jbpm4/trunk/modules/pvm/src/main/resources/org/jbpm/pvm/pvm.cache.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.cache.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.cache.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,38 @@ +<hibernate-cache> + + <class-cache class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" /> + <class-cache class="org.jbpm.pvm.internal.model.NodeImpl" /> + <class-cache class="org.jbpm.pvm.internal.model.TransitionImpl" /> + <class-cache class="org.jbpm.pvm.internal.model.EventImpl" /> + <class-cache class="org.jbpm.pvm.internal.model.ExceptionHandlerImpl" /> + <class-cache class="org.jbpm.pvm.internal.model.ObjectReference" /> + <class-cache class="org.jbpm.pvm.internal.model.VariableDefinitionImpl" /> + <class-cache class="org.jbpm.pvm.internal.model.TimerDefinitionImpl" /> + <class-cache class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" /> + + <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.exceptionHandlers" /> + <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.events" /> + <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.nodes" /> + <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.variableDefinitions" /> + <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.timerDefinitions" /> + + <collection-cache collection="org.jbpm.pvm.internal.model.NodeImpl.exceptionHandlers" /> + <collection-cache collection="org.jbpm.pvm.internal.model.NodeImpl.events" /> + <collection-cache collection="org.jbpm.pvm.internal.model.NodeImpl.nodes" /> + <collection-cache collection="org.jbpm.pvm.internal.model.NodeImpl.variableDefinitions" /> + <collection-cache collection="org.jbpm.pvm.internal.model.NodeImpl.timerDefinitions" /> + <collection-cache collection="org.jbpm.pvm.internal.model.NodeImpl.incomingTransitions" /> + <collection-cache collection="org.jbpm.pvm.internal.model.NodeImpl.outgoingTransitions" /> + + <collection-cache collection="org.jbpm.pvm.internal.model.TransitionImpl.exceptionHandlers" /> + <collection-cache collection="org.jbpm.pvm.internal.model.TransitionImpl.events" /> + + <collection-cache collection="org.jbpm.pvm.internal.model.EventImpl.exceptionHandlers" /> + <collection-cache collection="org.jbpm.pvm.internal.model.EventImpl.listenerReferences" /> + + <collection-cache collection="org.jbpm.pvm.internal.model.ExceptionHandlerImpl.eventListenerReferences" /> + + <collection-cache collection="org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor.argDescriptors" /> + <collection-cache collection="org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor.operations" /> + +</hibernate-cache> Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.cache.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.definition.hbm.xml (from rev 3138, jbpm4/trunk/modules/pvm/src/main/resources/org/jbpm/pvm/hibernate.definition.hbm.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.definition.hbm.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.definition.hbm.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,422 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping package="org.jbpm.pvm.internal.model" default-access="field"> + + <!-- ### PROCESS DEFINITION ############################################# --> + <class name="ProcessDefinitionImpl" table="JBPM_PROCESS"> + <!-- ProcessElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + <many-to-one name="properties" + class="WireProperties" + column="PROPS_" + foreign-key="FK_PROCDEF_PROPS" + index="IDX_PROCDEF_PROPS" + cascade="all" /> + <list name="exceptionHandlers" cascade="all"> + <key foreign-key="FK_EXHDLR_PROCESS"> + <column name="PROCESS_" index="IDX_EXHDLR_PROCESS"/> + </key> + <index column="PROCESS_IDX_" /> + <one-to-many class="ExceptionHandlerImpl"/> + </list> + + <!-- ObservableElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <property name="name" column="NAME_" /> + <property name="description" column="DESCR_" /> + <map name="events" cascade="all-delete-orphan"> + <key foreign-key="FK_EVENT_PROCESS"> + <column name="PROCESS_" index="IDX_EVENT_PROCESS" /> + </key> + <map-key type="string" column="NAME_" /> + <one-to-many class="org.jbpm.pvm.internal.model.EventImpl"/> + </map> + + <!-- CompositeElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <list name="nodes" cascade="all" inverse="false"> + <key foreign-key="FK_NODES_PROCESS"> + <column name="NODESPROCESS_" index="IDX_NODES_PROCESS"/> + </key> + <list-index column="NODESPROCESS_IDX_" /> + <one-to-many class="NodeImpl" /> + </list> + <property name="hasVariableDefinitions" column="HAS_VAR_DEF_" /> + <list name="variableDefinitions" cascade="all"> + <key foreign-key="FK_VARDEF_PROCESS"> + <column name="PROCESS_" index="IDX_VARDEF_PROCESS"/> + </key> + <index column="PROCESS_IDX_" /> + <one-to-many class="VariableDefinitionImpl" /> + </list> + <property name="hasTimerDefinitions" column="HAS_TIMER_DEF_" /> + <set name="timerDefinitions" cascade="all"> + <key foreign-key="FK_TMRDEF_PROCESS"> + <column name="PROCESS_" index="IDX_TMRDEF_PROCESS"/> + </key> + <one-to-many class="TimerDefinitionImpl" /> + </set> + + <!-- ProcessDefinitionImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <property name="key" column="KEY_" /> + <property name="id" column="ID_" unique="true" /> + + <property name="packageName" column="PACKAGE_" /> + <property name="version" column="VERSION_" /> + <property name="deploymentTime" column="DEPLOYED_" /> + <many-to-one name="initial" + column="INITIAL_" + class="NodeImpl" + cascade="all" + foreign-key="FK_PROCDEF_INITIAL" + index="IDX_PROCDEF_INIT" + fetch="select" /> + </class> + + <!-- ### Node ############################################################## --> + <class name="NodeImpl" table="JBPM_NODE"> + <!-- ProcessElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + <many-to-one name="processDefinition" + class="ProcessDefinitionImpl" + column="PROCESS_" + foreign-key="FK_NODE_PROCESS" + index="IDX_NODE_PROCESS" /> + <many-to-one name="properties" + class="WireProperties" + column="PROPS_" + foreign-key="FK_NODE_PROPS" + index="IDX_NODE_PROPS" + cascade="all" /> + <list name="exceptionHandlers" cascade="all"> + <key foreign-key="FK_EXHDLR_NODE"> + <column name="NODE_" index="IDX_EXHDLR_NODE"/> + </key> + <index column="NODE_IDX_" /> + <one-to-many class="ExceptionHandlerImpl" /> + </list> + + <!-- ObservableElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <property name="name" column="NAME_"/> + <property name="description" column="DESCR_"/> + <map name="events" cascade="all-delete-orphan"> + <key foreign-key="FK_EVENT_NODE"> + <column name="NODE_" index="IDX_EVENT_NODE" /> + </key> + <map-key type="string" column="NAME_" /> + <one-to-many class="org.jbpm.pvm.internal.model.EventImpl" /> + </map> + + <!-- CompositeElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <list name="nodes" cascade="all" inverse="false"> + <key column="PARENT_" foreign-key="none" /> + <list-index column="PARENT_IDX_" /> + <one-to-many class="NodeImpl" /> + </list> + <property name="hasVariableDefinitions" column="HAS_VAR_DEF_" /> + <list name="variableDefinitions" cascade="all"> + <key foreign-key="FK_VARDEF_NODE"> + <column name="NODE_" index="IDX_VARDEF_NODE"/> + </key> + <index column="NODE_IDX_" /> + <one-to-many class="VariableDefinitionImpl" /> + </list> + <property name="hasTimerDefinitions" column="HAS_TIMER_DEF_" /> + <set name="timerDefinitions" cascade="all"> + <key foreign-key="FK_TMRDEF_NODE"> + <column name="NODE_" index="IDX_TMRDEF_NODE"/> + </key> + <one-to-many class="TimerDefinitionImpl" /> + </set> + + <!-- NodeImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <property name="isLocalScope" column="LOCAL_SCOPE_" /> + <property name="isExecutionAsync" column="EXEC_ASYNC_" /> + <property name="isSignalAsync" column="SIGNAL_ASYNC_" /> + <property name="isPreviousNeeded" column="PREV_NEEDED_" /> + + <many-to-one name="parentNode" + column="PARENT_" + class="NodeImpl" + cascade="all" + foreign-key="FK_NODE_PARENT" + index="IDX_NODE_PARENT" /> + + <many-to-one name="defaultTransition" + column="DEFTRANS_" + class="TransitionImpl" + fetch="select" + foreign-key="FK_NODE_DEFTRANS" + index="IDX_NODE_DEFTRANS" /> + + <list name="incomingTransitions" inverse="false"> + <key column="DESTINATION_" /> + <index column="IN_IDX_" /> + <one-to-many class="TransitionImpl" /> + </list> + + <list name="outgoingTransitions" inverse="false" cascade="all"> + <key column="SOURCE_" /> + <index column="OUT_IDX_" /> + <one-to-many class="TransitionImpl" /> + </list> + + <component name="behaviourReference" class="ObjectReference"> + <many-to-one name="descriptor" + column="BEHAV_DESCR_" + cascade="all" + class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" + foreign-key="FK_NODE_BEHAV_DESCR" + index="IDX_NODE_BEHAV_DESCR" /> + <any name="object" id-type="long" cascade="all"> + <!-- TODO: Specify names for classes --> + <!-- <meta-value value="bpel::activity" class="org.jbpm.pvm.bpel.BpelActivity"/> --> + <column name="BEHAV_CLASS_" /> + <column name="BEHAV_ID_" /> + </any> + </component> + </class> + + <!-- ### TRANSITION ##################################################### --> + <class name="TransitionImpl" table="JBPM_TRANSITION"> + <!-- ProcessElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + <many-to-one name="processDefinition" + class="ProcessDefinitionImpl" + column="PROCESS_" + foreign-key="FK_TRANS_PROCDEF" + index="IDX_TRANS_PROCDEF" /> + <many-to-one name="properties" + class="WireProperties" + column="PROPS_" + foreign-key="FK_TRANS_PROPS" + index="IDX_TRANS_PROPS" + cascade="all" /> + <list name="exceptionHandlers" cascade="all"> + <key foreign-key="FK_EXHDLR_TRANS"> + <column name="TRANSITION_" index="IDX_EXHDLR_TRANS" /> + </key> + <index column="TRANSITION_IDX_" /> + <one-to-many class="ExceptionHandlerImpl" /> + </list> + + <!-- ObservableElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <property name="name" column="NAME_" /> + <property name="description" column="DESCR_" /> + <map name="events" cascade="all-delete-orphan"> + <key foreign-key="FK_EVENT_TRANS"> + <column name="TRANSITION_" index="IDX_EVENT_TRANS" /> + </key> + <map-key type="string" column="NAME_" /> + <one-to-many class="org.jbpm.pvm.internal.model.EventImpl" /> + </map> + + <!-- TransitionImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <many-to-one name="source" + column="SRC_" + class="NodeImpl" + fetch="select" + foreign-key="FK_TRANS_SRC" + index="IDX_TRANS_SRC" /> + + <many-to-one name="destination" + column="DEST_" + class="NodeImpl" + fetch="select" + cascade="all" + foreign-key="FK_TRANS_DST" + index="IDX_TRANS_DST" /> + + <many-to-one name="conditionDescriptor" + column="COND_DESCR_" + class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" + cascade="all" + foreign-key="FK_TRANS_COND" + index="IDX_TRANS_COND" /> + + <!-- + <many-to-one name="waitConditionDescriptor" + column="WAIT_DESCR_" + class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" + cascade="all" + foreign-key="FK_TRANS_WAIT_DESCR" + index="IDX_TRANS_WAIT_DESCR" /> + --> + + <property name="isTakeAsync" column="TAKEASYNC_" /> + </class> + + <!-- ### EVENT ########################################################## --> + <class name="EventImpl" table="JBPM_EVENT"> + <!-- ProcessElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + <many-to-one name="processDefinition" + class="ProcessDefinitionImpl" + column="PROCESSDEF_" + foreign-key="FK_EVENT_PROCDEF" + index="IDX_EVENT_PROCDEF" /> + <many-to-one name="properties" + class="WireProperties" + column="PROPS_" + foreign-key="FK_EVENT_PROPS" + index="IDX_EVENT_PROPS" + cascade="all" /> + <list name="exceptionHandlers" cascade="all"> + <key foreign-key="FK_EXHDLR_EVENT"> + <column name="EVENT_" index="IDX_EXHDLR_EVENT"/> + </key> + <index column="EVENT_IDX_" /> + <one-to-many class="ExceptionHandlerImpl" /> + </list> + + <!-- EventImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> + <property name="name" column="NAME_" /> + <list name="listenerReferences" table="JBPM_OBJECTREFERENCES" cascade="all-delete-orphan"> + <key foreign-key="FK_OBJECTREF_EVENT"> + <column name="EVENT_" index="IDX_OBJREF_EVENT"/> + </key> + <list-index column="EVENT_IDX_" /> + <one-to-many class="EventListenerReference" /> + </list> + </class> + + <!-- ### EXCEPTION HANDLER ############################################## --> + <class name="ExceptionHandlerImpl" table="JBPM_EXCEPTHNDLR"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + <property name="exceptionClassName" column="EXCEPT_CLASS_" /> + <property name="isTransactional" column="TRANSACT_" /> + <property name="isRethrowMasked" column="RETHROW_MASKED_"/> + <property name="transitionName" column="TRANSITIONNAME_" /> + <property name="nodeName" column="NODENAME_" /> + <list name="eventListenerReferences" + inverse="false" + cascade="all-delete-orphan" + table="JBPM_OBJECTREFERENCES"> + <key foreign-key="FK_OBJREF_EXHNDLR" not-null="false"> + <column name="EXHNDLR_" index="IDX_OBJREF_EXHNDLR" /> + </key> + <list-index column="EXHNDLR_IDX_" /> + <one-to-many class="ObjectReference" /> + </list> + </class> + + <!-- ### OBJECT REFERENCE ############################################### --> + <class name="ObjectReference" discriminator-value="objref" table="JBPM_OBJECTREF"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_" /> + <version name="dbversion" column="DBVERSION_" /> + <many-to-one name="descriptor" + column="OBJ_DESCR_" + class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" + cascade="all" + foreign-key="FK_OBJREF_EVENT" + index="IDX_OBJREF_EVENT"/> + <any name="object" id-type="long" cascade="all"> + <!-- TODO: Specify names for classes --> + <column name="OBJ_CLASS_" /> + <column name="OBJ_ID_" /> + </any> + <property name="expression" column="OBJ_EXPRESSION_"/> + <property name="expressionLanguage" column="OBJ_EXPRLANG_"/> + + <subclass name="EventListenerReference" discriminator-value="evtlis"> + <property name="isPropagationEnabled" column="PROPAGATE_" /> + </subclass> + + </class> + + <!-- ### VARIABLE DEFINITION ############################################ --> + <class name="VariableDefinitionImpl" table="JBPM_VARIABLEDEF"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + <property name="key" column="KEY_"/> + <property name="description" column="DESCR_"/> + + <property name="source" column="SRC_" /> + <property name="sourceExpression" column="SRCEXPR_" /> + <many-to-one name="sourceDescriptor" + column="SRCDESCR_" + class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" + cascade="all" + foreign-key="FK_VARDEF_SRCDES" + index="IDX_VARDEF_SRCDES"/> + <property name="destination" column="DEST_" /> + <property name="destinationExpression" column="DESTEXPR_" /> + <component name="type" class="org.jbpm.pvm.internal.type.Type"> + <property name="variableClass" type="class" column="TYPE_VARCLASS_" /> + <property name="converter" type="converter" column="TYPE_CONVERTER_" /> + </component> + </class> + + <!-- ### TIMER DEFINITION ############################################### --> + <class name="TimerDefinitionImpl" table="JBPM_TIMERDEF"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + <property name="dueDateDescription" column="DUEDATEDESCR_"/> + <property name="repeat" column="REPEAT_"/> + <property name="isExclusive" column="ISEXCL_"/> + <property name="retries" column="RETRIES_"/> + <property name="eventName" column="EVENT_"/> + <property name="signalName" column="SIGNAL_"/> + <property name="dueDate" column="DUEDATE_" type="timestamp"/> + </class> + + <!-- ### QUERIES ######################################################## --> + + <query name="findProcessDefinitionNames"> + <![CDATA[ + select distinct process.name + from org.jbpm.pvm.internal.model.ProcessDefinitionImpl as process + order by process.name asc + ]]> + </query> + + <query name="findProcessDefinitionsByName"> + <![CDATA[ + select process + from org.jbpm.pvm.internal.model.ProcessDefinitionImpl as process + where process.name = :name + order by process.version desc + ]]> + </query> + + <query name="findProcessDefinitionByNameAndVersion"> + <![CDATA[ + select process + from org.jbpm.pvm.internal.model.ProcessDefinitionImpl as process + where process.name = :name + and process.version = :version + ]]> + </query> + + <query name="findProcessDefinitionsById"> + <![CDATA[ + select process + from org.jbpm.pvm.internal.model.ProcessDefinitionImpl as process + where process.id = :id + ]]> + </query> + + + +</hibernate-mapping> \ No newline at end of file Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.definition.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.execution.hbm.xml (from rev 3138, jbpm4/trunk/modules/pvm/src/main/resources/org/jbpm/pvm/hibernate.execution.hbm.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.execution.hbm.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.execution.hbm.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,146 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping package="org.jbpm.pvm.internal.model" default-access="field"> + + <!-- ### PROCESS DEFINITION ############################################# --> + <class name="ExecutionImpl" table="JBPM_EXECUTION"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <many-to-one name="node" + class="org.jbpm.pvm.internal.model.NodeImpl" + column="NODE_" + foreign-key="FK_EXEC_NODE" + index="IDX_EXEC_NODE" /> + + <property name="hasVariables" column="HASVARS_" /> + <map name="variables" + cascade="all-delete-orphan" + table="JBPM_VARIABLE"> + <key foreign-key="FK_VAR_EXECUTION"> + <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> + </key> + <map-key type="string" column="KEY_" /> + <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> + </map> + + <property name="hasTimers" column="HASTIMERS_" /> + <set name="timers" + cascade="all-delete-orphan" + table="JBPM_TIMER"> + <key foreign-key="FK_TMR_EXECUTION"> + <column name="EXECUTION_" index="IDX_TMR_EXECUTION"/> + </key> + <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> + </set> + + <property name="name" column="NAME_" /> + <property name="key" column="KEY_" /> + <property name="id" column="ID_" unique="true" /> + + <property name="state" column="STATE_" /> + + <property name="priority" column="PRIORITY_" /> + <property name="nextLogIndex" column="NEXTLOGIDX_" /> + + <many-to-one name="processDefinition" + class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" + column="PROCESS_" + foreign-key="FK_EXEC_PROCESS" + index="IDX_EXEC_PROCESS" /> + + <many-to-one name="transition" column="TRANSITION_" class="TransitionImpl" /> + + <many-to-one name="transitionOrigin" + class="org.jbpm.pvm.internal.model.NodeImpl" + column="TRANSORIG_" + foreign-key="FK_EXEC_TRANSORIG" + index="IDX_EXEC_TRANSORIG" /> + + <list name="executions" + cascade="all-delete-orphan" + inverse="false"> + <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> + <list-index column="PARENT_IDX_" /> + <one-to-many class="ExecutionImpl" /> + </list> + + <many-to-one name="parent" + column="PARENT_" + class="ExecutionImpl" + foreign-key="FK_EXEC_PARENT" + index="IDX_EXEC_PARENT" /> + + <many-to-one name="processInstance" + class="ExecutionImpl" + column="INSTANCE_" + foreign-key="FK_EXEC_INSTANCE" + index="IDX_EXEC_INSTANCE" /> + + <many-to-one name="superProcessExecution" + column="SUPEREXEC_" + class="ExecutionImpl" + foreign-key="FK_EXEC_SUPEREXEC" + index="IDX_EXEC_SUPEREXEC" /> + </class> + + <!-- ### COMMENTS ####################################################### --> + <class name="CommentImpl" table="JBPM_COMMENT"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_" /> + <version name="dbversion" column="DBVERSION_" /> + + <property name="userId" column="USERID_" /> + <property name="time" column="TIME_" /> + <property name="message" column="MESSAGE_" /> + + <many-to-one name="parent" + column="PARENT_" + class="CommentImpl" + foreign-key="FK_COMMENT_PARENT" + index="IDX_COMMENT_PARENT" /> + + <list name="comments" + cascade="all-delete-orphan" + inverse="false"> + <key column="PARENT_" foreign-key="none" /> + <list-index column="PARENT_IDX_" /> + <one-to-many class="CommentImpl" /> + </list> + </class> + + <!-- ### QUERIES ######################################################## --> + + <query name="findExecutionById"> + <![CDATA[ + select execution + from org.jbpm.pvm.internal.model.ExecutionImpl as execution + where execution.id = :id + ]]> + </query> + + <query name="findExecutionByKey"> + <![CDATA[ + select execution + from org.jbpm.pvm.internal.model.ExecutionImpl as execution + where execution.key = :executionKey + and execution.processDefinition.name = :processDefinitionName + ]]> + </query> + + <query name="findProcessInstanceIds"> + <![CDATA[ + select processInstance.id + from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance + where processInstance.processDefinition.id = :processDefinitionId + and processInstance.parent is null + ]]> + </query> + + +</hibernate-mapping> \ No newline at end of file Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.execution.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.job.hbm.xml (from rev 3138, jbpm4/trunk/modules/pvm/src/main/resources/org/jbpm/pvm/hibernate.job.hbm.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.job.hbm.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.job.hbm.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,136 @@ +<?xml version="1.0"?> + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping package="org.jbpm.pvm.internal.job" default-access="field"> + + <class name="JobImpl" table="JBPM_JOB" discriminator-value="Job"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_" /> + <version name="dbversion" column="DBVERSION_" /> + + <property name="dueDate" column="DUEDATE_" type="timestamp" /> + <property name="isSuspended" column="ISSUSPENDED_" /> + <property name="isExclusive" column="ISEXCLUSIVE_" /> + <property name="lockOwner" column="LOCKOWNER_" /> + <property name="lockExpirationTime" column="LOCKEXPTIME_" /> + <property name="exception" column="EXCEPTION_" type="text" /> + <property name="retries" column="RETRIES_" /> + + <many-to-one name="processInstance" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="PROCESSINSTANCE_" + cascade="none" + foreign-key="FK_JOB_PRINST" + index="IDX_JOB_PRINST"/> + <many-to-one name="execution" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="EXECUTION_" + cascade="none" + foreign-key="FK_JOB_EXE" + index="IDX_JOB_EXE"/> + <many-to-one name="commandDescriptor" + column="CMDDESCR_" + class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" + cascade="all" + foreign-key="FK_JOB_CMDDESCR" + index="IDX_JOB_CMDDESCR"/> + + <subclass name="MessageImpl" discriminator-value="Msg"> + <subclass name="org.jbpm.pvm.internal.model.op.ExecuteNodeMessage" discriminator-value="ExeNodeMsg" /> + <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> + <property name="signalName" column="SIGNAL_" /> + <many-to-one name="node" + column="NODE_" + cascade="none" + foreign-key="FK_JOB_NODE"/> + </subclass> + <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> + <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> + <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> + </subclass> + + <subclass name="TimerImpl" discriminator-value="Timer"> + <property name="signalName" column="SIGNAL_" /> + <property name="eventName" column="EVENT_" /> + <property name="repeat" column="REPEAT_" /> + </subclass> + + </class> + + <!-- ### HibernatePvmDbSession QUERIES ################################## --> + + <query name="findTimers"> + <![CDATA[ + select t + from org.jbpm.pvm.internal.job.TimerImpl as t + order by dueDate asc + ]]> + </query> + + <query name="findMessages"> + <![CDATA[ + select m + from org.jbpm.pvm.internal.job.MessageImpl as m + ]]> + </query> + + <query name="findJobsWithException"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where job.retries = 0 + order by dueDate asc + ]]> + </query> + + <!-- ### HibernateJobDbSession QUERIES ################################## --> + + <query name="findFirstAcquirableJob"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where ( ( (job.lockExpirationTime is null) + or (job.lockExpirationTime <= :now) + ) + and + ( (job.dueDate is null) + or (job.dueDate <= :now) + ) + and + ( job.retries > 0 ) + ) + order by job.dueDate asc + ]]> + </query> + + <query name="findExclusiveJobs"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where job.lockOwner is null + and job.processInstance = :processInstance + and job.isExclusive = true + and job.retries > 0 + and ( (job.dueDate is null) + or (job.dueDate <= :now) + ) + order by job.dueDate asc + ]]> + </query> + + <query name="findFirstDueJob"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where job.lockOwner is null + and job.retries > 0 + order by job.dueDate asc + ]]> + </query> + +</hibernate-mapping> \ No newline at end of file Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.job.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.typedefs.hbm.xml (from rev 3138, jbpm4/trunk/modules/pvm/src/main/resources/org/jbpm/pvm/hibernate.typedefs.hbm.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.typedefs.hbm.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.typedefs.hbm.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,20 @@ +<?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> + + <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> + <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> + <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> + <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> + <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> + <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> + <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> + <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> + <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> + <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> + <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> + <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> + </typedef> + +</hibernate-mapping> \ No newline at end of file Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.typedefs.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.types.xml (from rev 3138, jbpm4/trunk/modules/pvm/src/main/resources/org/jbpm/pvm/pvm.types.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.types.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.types.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,34 @@ +<variable-types> + + <!-- types stored in a native column --> + <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> + + <!-- types converted to a string --> + <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + + <!-- types converted to a long --> + <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + + <!-- types converted to a double --> + <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> + + <!-- byte[] and char[] --> + <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> + <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> + + <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> + <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> + + <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> + + <!-- TODO: add ejb3 entity bean support --> + <!-- TODO: add JCR node support --> + <!-- TODO: add collection support --> + +</variable-types> Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.types.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.variable.hbm.xml (from rev 3138, jbpm4/trunk/modules/pvm/src/main/resources/org/jbpm/pvm/hibernate.variable.hbm.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.variable.hbm.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.variable.hbm.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,92 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping package="org.jbpm.pvm.internal.type.variable" default-access="field"> + + <!-- ### VARIABLE ####################################################### --> + <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> + <!-- discriminator values: + date : org.jbpm.pvm.internal.type.variable.DateVariable + double : org.jbpm.pvm.internal.type.variable.DoubleVariable + hibl : org.jbpm.pvm.internal.type.variable.HibernateLongVariable + long : org.jbpm.pvm.internal.type.variable.LongVariable + hibs : org.jbpm.pvm.internal.type.variable.HibernateStringVariable + string : org.jbpm.pvm.internal.type.variable.StringVariable + null : org.jbpm.pvm.internal.type.variable.NullVariable + blob : org.jbpm.pvm.internal.type.variable.BlobVariable + clob : org.jbpm.pvm.internal.type.variable.ClobVariable + --> + + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_"/> + <version name="dbversion" column="DBVERSION_" /> + + <property name="key" column="KEY_"/> + <property name="queryText" column="QUERYTEXT_" /> + <property name="converter" type="converter" column="CONVERTER_" /> + <many-to-one name="processInstance" + column="PROCINST_" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + foreign-key="FK_VAR_PROCINST" + index="IDX_VAR_PROCINST"/> + </class> + + <subclass name="DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> + <property name="date" column="DATE_VALUE_" type="timestamp"/> + </subclass> + + <subclass name="DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> + <property name="d" column="DOUBLE_VALUE_" type="double"/> + </subclass> + + <subclass name="HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> + <property name="hibernatable" column="LONG_VALUE_" type="long"/> + </subclass> + + <subclass name="LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> + <property name="l" column="LONG_VALUE_" type="long"/> + </subclass> + + <subclass name="HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> + <property name="hibernatable" column="STRING_VALUE_" type="string"/> + </subclass> + + <subclass name="StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> + <property name="string" column="STRING_VALUE_" type="string"/> + </subclass> + + <subclass name="NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> + </subclass> + + <subclass name="BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> + <component name="blob" class="org.jbpm.pvm.internal.lob.Blob"> + <property name="blob" type="blob" column="BLOB_VALUE_" /> + <property name="bytes" type="binary" column="BINARY_VALUE_"/> + <property name="fileName" type="string" column="STRING_VALUE_"/> + <list name="chops" table="JBPM_BLOB_CHOPS"> + <key foreign-key="FK_BLOB_CHOP_OWN"> + <column name="BLOB_ID_" index="IDX_BLOB_CHOP_OWN"/> + </key> + <list-index column="CHOP_INDEX_"/> + <element type="binary" column="CHOP_VALUE_"/> + </list> + </component> + </subclass> + + <subclass name="ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> + <component name="clob" class="org.jbpm.pvm.internal.lob.Clob"> + <property name="clob" type="clob" column="CLOB_VALUE_" /> + <property name="text" type="text" column="TEXT_VALUE_"/> + <list name="chops" table="JBPM_CLOB_CHOPS"> + <key foreign-key="FK_CLOB_CHOP_OWN"> + <column name="CLOB_ID_" index="IDX_CLOB_CHOP_OWN"></column> + </key> + <list-index column="CHOP_INDEX_"/> + <element type="string" column="CHOP_VALUE_"/> + </list> + </component> + </subclass> + +</hibernate-mapping> \ No newline at end of file Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.variable.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml (from rev 3138, jbpm4/trunk/modules/pvm/src/main/resources/org/jbpm/pvm/pvm.wire.bindings.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,84 @@ +<wire-bindings> + + <!-- ########################### --> + <!-- ### Descriptor bindings ### --> + <!-- ########################### --> + <!-- basic types --> + <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> + <!-- object and ref --> + <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> + <!-- collections --> + <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> + <!-- environment refs --> + <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentFactoryRefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentRefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> + <!-- various specials --> + <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> + <!-- hibernate bindings --> + <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> + <!-- sessions --> + <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> + <!-- db sessions --> + <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> + <!-- dynamic type mapping configuration --> + <binding class="org.jbpm.pvm.internal.wire.binding.VariableTypesBinding" /> + <!-- services --> + <binding class="org.jbpm.pvm.internal.wire.binding.StandardCommandServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.AsyncCommandServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ProcessServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> + <!-- deployers --> + <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.CreateProcessBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.CheckVersionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.SaveProcessBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.CreateIdBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.CheckProblemsBinding" /> + + <!-- ############################ --> + <!-- ### Interceptor bindings ### --> + <!-- ############################ --> + <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" /> + + <!-- ########################## --> + <!-- ### Operation bindings ### --> + <!-- ########################## --> + <binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" /> + +</wire-bindings> Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.bindings.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Copied: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml (from rev 3138, jbpm4/trunk/modules/pvm/src/main/resources/org/jbpm/pvm/hibernate.wire.hbm.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,213 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping package="org.jbpm.pvm.internal.wire.descriptor" default-access="field"> + + <!-- ### DESCRIPTORS #################################################### --> + <class name="AbstractDescriptor" table="JBPM_DESCRIPTOR" abstract="true" discriminator-value="abstract"> + <!-- + byte : ByteDescriptor + string : StringDescriptor + char : CharacterDescriptor + class : ClassDescriptor + double : DoubleDescriptor + expr : ExpressionDescriptor + float : FloatDescriptor + long : LongDescriptor + int : IntegerDescriptor + short : ShortDescriptor + coll : CollectionDescriptor + map : MapDescriptor + list : ListDescriptor + set : SetDescriptor + object : ObjectDescriptor + ref : ReferenceDescriptor + null : NullDescriptor + true : TrueDescriptor + false : FalseDescriptor + provided : ProvidedObjectDescriptor + --> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_"/> + <version name="dbversion" column="DBVERSION_" /> + + <property name="name" column="NAME_" /> + <property name="init" column="INIT_" /> + + <subclass name="NullDescriptor" discriminator-value="null_"/> + <subclass name="TrueDescriptor" discriminator-value="true" /> + <subclass name="FalseDescriptor" discriminator-value="false" /> + + <subclass name="StringDescriptor" discriminator-value="string"> + <property name="text" column="TEXT_" /> + </subclass> + + <subclass name="CharacterDescriptor" discriminator-value="char"> + <property name="text" column="TEXT_" /> + </subclass> + <subclass name="ClassDescriptor" discriminator-value="class"> + <property name="text" column="TEXT_" /> + </subclass> + <subclass name="ReferenceDescriptor" discriminator-value="ref"> + <property name="text" column="TEXT_" /> + </subclass> + + + <subclass name="DoubleDescriptor" discriminator-value="double"> + <property name="doubleVal" column="DOUBLEVAL_" /> + </subclass> + <subclass name="FloatDescriptor" discriminator-value="float"> + <property name="doubleVal" column="DOUBLEVAL_" /> + </subclass> + + + <subclass name="LongDescriptor" discriminator-value="long"> + <property name="longVal" column="LONGVAL_" /> + </subclass> + <subclass name="IntegerDescriptor" discriminator-value="int"> + <property name="longVal" column="LONGVAL_" /> + </subclass> + <subclass name="ShortDescriptor" discriminator-value="short"> + <property name="longVal" column="LONGVAL_" /> + </subclass> + <subclass name="ByteDescriptor" discriminator-value="byte"> + <property name="longVal" column="LONGVAL_" /> + </subclass> + + + <subclass name="CollectionDescriptor" discriminator-value="coll"> + <property name="className" column="CLASSNAME_" /> + <list name="valueDescriptors" cascade="all-delete-orphan"> + <key column="VALUEDESCR_" foreign-key="FK_DESCR_VALDESCR"/> + <list-index column="VALUEDESCR_IDX_" /> + <one-to-many class="AbstractDescriptor" /> + </list> + + <subclass name="MapDescriptor" discriminator-value="map"> + <list name="keyDescriptors" cascade="all-delete-orphan"> + <key column="KEYDESCR_" foreign-key="FK_DESCR_KEYDESCR"/> + <list-index column="KEYDESCR_IDX_" /> + <one-to-many class="AbstractDescriptor" /> + </list> + </subclass> + + <subclass name="ListDescriptor" discriminator-value="list" /> + <subclass name="SetDescriptor" discriminator-value="set" /> + </subclass> + + + <subclass name="ObjectDescriptor" discriminator-value="object"> + <property name="className" column="TEXT_" /> + <property name="methodName" column="METHOD_" /> + <property name="isAutoWireEnabled" column="BOOLVAL_" /> + <property name="factoryObjectName" column="FACTORYNAME_" /> + + <many-to-one name="factoryDescriptor" + class="AbstractDescriptor" + column="FACTORYDESCR_" + foreign-key="DESCR_ARG_REF_FK" + cascade="all"/> + + <list name="argDescriptors" cascade="all-delete-orphan" > + <key column="OBJDESCR_" foreign-key="FK_OBJDESCR_ARGS"/> + <list-index column="OBJDESCR_IDX_" /> + <one-to-many class="ArgDescriptor" /> + </list> + + <list name="operations" cascade="all-delete-orphan"> + <key column="OBJDESCR_" foreign-key="FK_OPER_OBJDESCR"/> + <list-index column="OBJDESCR_IDX_" /> + <one-to-many class="org.jbpm.pvm.internal.wire.operation.AbstractOperation"/> + </list> + </subclass> + + <subclass name="ExpressionDescriptor" discriminator-value="expr"> + <property name="expression" column="TEXT_" /> + <property name="language" column="METHOD_" /> + </subclass> + + <subclass name="ProvidedObjectDescriptor" discriminator-value="provided"> + <any name="providedObject" id-type="long" cascade="all"> + <column name="TEXT_" /> + <column name="LONGVAL_" /> + </any> + <property name="exposeType" column="BOOLVAL_" /> + </subclass> + </class> + + <!-- ### OPERATIONS ##################################################### --> + <class name="org.jbpm.pvm.internal.wire.operation.AbstractOperation" + abstract="true" + table="JBPM_OPERATION" + discriminator-value="oper"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_"/> + <version name="dbversion" column="DBVERSION_" /> + + <subclass name="org.jbpm.pvm.internal.wire.operation.FieldOperation" discriminator-value="field"> + <property name="fieldName" column="TEXT_" /> + <many-to-one name="descriptor" + column="FIELDDESCR_" + cascade="all" + class="AbstractDescriptor" + foreign-key="FK_OPER_FIELDDESC"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.wire.operation.PropertyOperation" discriminator-value="prop"> + <property name="setterName" column="TEXT_" /> + <many-to-one name="descriptor" + column="PROPDESCR_" + cascade="all" + class="AbstractDescriptor" + foreign-key="FK_OPER_PROPDESC" /> + </subclass> + + <subclass name="org.jbpm.pvm.internal.wire.operation.InvokeOperation" discriminator-value="invoke"> + <property name="methodName" column="TEXT_" /> + <list name="argDescriptors" cascade="all-delete-orphan"> + <key column="OPER_" foreign-key="FK_OPER_ARGS"/> + <list-index column="OPER_IDX_" /> + <one-to-many class="ArgDescriptor" /> + </list> + </subclass> + </class> + + <!-- ### ARG DESCRIPTOR ################################################# --> + <class name="ArgDescriptor" table="JBPM_ARGDESCRIPTOR"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + <property name="typeName" column="TYPENAME_" /> + <many-to-one name="descriptor" + column="DESCRIPTOR_" + class="AbstractDescriptor" + foreign-key="FK_ARGDESCR_DESCR" + cascade="all"/> + </class> + + <!-- ### PROPERTIES ##################################################### --> + <class name="org.jbpm.pvm.internal.model.WireProperties" table="JBPM_WIREPROPS"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + <component name="wireContext" class="org.jbpm.pvm.internal.wire.WireContext"> + <component name="wireDefinition" class="org.jbpm.pvm.internal.wire.WireDefinition"> + <map name="descriptors" cascade="all-delete-orphan" lazy="false"> + <key foreign-key="FK_DESCR_PROPS"> + <column name="PROPS_" index="IDX_DESCR_PROPS" /> + </key> + <map-key type="string" column="NAME_" /> + <one-to-many class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" /> + </map> + </component> + </component> + </class> + +</hibernate-mapping> \ No newline at end of file Property changes on: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Deleted: jbpm4/trunk/modules/pvm/src/main/resources/org.jbpm.api.client.Configuration =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/org.jbpm.api.client.Configuration 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/main/resources/org.jbpm.api.client.Configuration 2008-11-28 11:20:28 UTC (rev 3144) @@ -1 +0,0 @@ -org.jbpm.pvm.MockProcessEngineConfiguration \ No newline at end of file Deleted: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/pvm.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/pvm.wire.bindings.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/pvm.wire.bindings.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -1,5 +0,0 @@ -<wire-bindings> - - <binding class="org.jbpm.pvm.api.timer.TestTimerSessionBinding" /> - -</wire-bindings> Modified: jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -24,8 +24,13 @@ <hibernate-configuration> <properties resource="hibernate.properties" /> - <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /> - <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" usage="nonstrict-read-write" /> </hibernate-configuration> @@ -35,7 +40,7 @@ <job-test-helper /> <id-generator /> - <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> + <variable-types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/> Copied: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.user.bindings.xml (from rev 3138, jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm.wire.bindings.xml) =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/jbpm.user.bindings.xml (rev 0) +++ jbpm4/trunk/modules/pvm/src/test/resources/jbpm.user.bindings.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -0,0 +1,5 @@ +<wire-bindings> + + <binding class="org.jbpm.pvm.api.timer.TestTimerSessionBinding" /> + +</wire-bindings> Property changes on: jbpm4/trunk/modules/pvm/src/test/resources/jbpm.user.bindings.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -8,8 +8,14 @@ <hibernate-configuration> <properties resource="hibernate.properties" /> - <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /> - <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" usage="nonstrict-read-write" /> + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" + usage="nonstrict-read-write" /> </hibernate-configuration> <hibernate-session-factory /> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -24,11 +24,17 @@ <hibernate-configuration> <properties resource="hibernate.properties" /> - <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /> - <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" usage="nonstrict-read-write" /> + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" + usage="nonstrict-read-write" /> </hibernate-configuration> <hibernate-session-factory /> - <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> + <variable-types resource="jbpm.pvm.types.xml" /> </process-engine> <environment> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/spring/spring.beans.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/spring/spring.beans.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/spring/spring.beans.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -36,12 +36,12 @@ scope="singleton"> <property name="mappingResources"> <list> - <value>org/jbpm/pvm/hibernate.typedefs.hbm.xml</value> - <value>org/jbpm/pvm/hibernate.wire.hbm.xml</value> - <value>org/jbpm/pvm/hibernate.definition.hbm.xml</value> - <value>org/jbpm/pvm/hibernate.execution.hbm.xml</value> - <value>org/jbpm/pvm/hibernate.variable.hbm.xml</value> - <value>org/jbpm/pvm/hibernate.job.hbm.xml</value> + <value>jbpm.pvm.typedefs.hbm.xml</value> + <value>jbpm.pvm.wire.hbm.xml</value> + <value>jbpm.pvm.definition.hbm.xml</value> + <value>jbpm.pvm.execution.hbm.xml</value> + <value>jbpm.pvm.variable.hbm.xml</value> + <value>jbpm.pvm.job.hbm.xml</value> </list> </property> <property name="hibernateProperties"><value> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -26,12 +26,18 @@ <hibernate-configuration> <properties resource="hibernate.properties" /> - <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /> - <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" usage="nonstrict-read-write" /> + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" + usage="nonstrict-read-write" /> </hibernate-configuration> <hibernate-session-factory /> - <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> + <variable-types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -1,7 +1,7 @@ <jbpm-configuration> <process-engine> - <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> + <variable-types resource="jbpm.pvm.types.xml" /> </process-engine> <environment> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/langext/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/langext/environment.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/langext/environment.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -24,14 +24,20 @@ <hibernate-configuration> <properties resource="hibernate.properties" /> - <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /> - <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" usage="nonstrict-read-write" /> + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> <mapping resource="org/jbpm/pvm/internal/db/langext/language.extensions.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" + usage="nonstrict-read-write" /> </hibernate-configuration> <hibernate-session-factory /> - <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> + <variable-types resource="jbpm.pvm.types.xml" /> </process-engine> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -4,12 +4,18 @@ <hibernate-configuration> <properties resource="hibernate.properties" /> - <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /> - <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" usage="nonstrict-read-write" /> + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" + usage="nonstrict-read-write" /> </hibernate-configuration> <hibernate-session-factory /> - <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> + <variable-types resource="jbpm.pvm.types.xml" /> </process-engine> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/type/environmentCustomTypes.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/type/environmentCustomTypes.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/type/environmentCustomTypes.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -4,8 +4,14 @@ <hibernate-configuration> <properties resource="hibernate.properties" /> - <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /> - <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" usage="nonstrict-read-write" /> + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" + usage="nonstrict-read-write" /> </hibernate-configuration> <hibernate-session-factory /> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -11,14 +11,20 @@ <hibernate-configuration> <properties resource="hibernate.properties" /> - <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /> + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> <mapping resource="org/jbpm/pvm/internal/jobexecutor/mappings.hbm.xml" /> - <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" usage="nonstrict-read-write" /> + <cache-configuration resource="jbpm.pvm.cache.xml" + usage="nonstrict-read-write" /> </hibernate-configuration> <hibernate-session-factory /> - <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> + <variable-types resource="jbpm.pvm.types.xml" /> <!-- used in JobExecutorTest --> <list name="processedMessageIds" synchronized="true" /> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -1,7 +1,7 @@ <jbpm-configuration> <process-engine> - <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> + <variable-types resource="jbpm.pvm.types.xml" /> </process-engine> <environment> Deleted: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm.wire.bindings.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm.wire.bindings.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm.wire.bindings.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -1,5 +0,0 @@ -<wire-bindings> - - <binding class="org.jbpm.pvm.api.timer.TestTimerSessionBinding" /> - -</wire-bindings> Modified: jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -24,8 +24,13 @@ <hibernate-configuration> <properties resource="hibernate.properties" /> - <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /> - <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" usage="nonstrict-read-write" /> </hibernate-configuration> @@ -35,7 +40,7 @@ <job-test-helper /> <id-generator /> - <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> + <variable-types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/> Modified: jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -24,8 +24,13 @@ <hibernate-configuration> <properties resource="hibernate.properties" /> - <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /> - <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" usage="nonstrict-read-write" /> </hibernate-configuration> @@ -35,7 +40,7 @@ <job-test-helper /> <id-generator /> - <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> + <variable-types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/> Modified: jbpm4/trunk/modules/task/src/test/resources/org.jbpm.task.cfg.xml =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/org.jbpm.task.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/task/src/test/resources/org.jbpm.task.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -13,8 +13,14 @@ <hibernate-configuration> <properties resource="hibernate.properties" /> - <mappings resources="pvm.hibernate.mappings.xml" /> - <cache-configuration resource="pvm.definition.cache.xml" usage="nonstrict-read-write" /> + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" + usage="nonstrict-read-write" /> </hibernate-configuration> <hibernate-session-factory /> <variable-types resource="pvm.variable.types.xml" /> Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2008-11-28 11:05:29 UTC (rev 3143) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2008-11-28 11:20:28 UTC (rev 3144) @@ -26,14 +26,14 @@ <hibernate-configuration> <properties resource="hibernate.properties" /> - <mapping resource="org/jbpm/pvm/hibernate.typedefs.hbm.xml" /> - <mapping resource="org/jbpm/pvm/hibernate.wire.hbm.xml" /> - <mapping resource="org/jbpm/pvm/hibernate.definition.hbm.xml" /> - <mapping resource="org/jbpm/pvm/hibernate.execution.hbm.xml" /> - <mapping resource="org/jbpm/pvm/hibernate.variable.hbm.xml" /> - <mapping resource="org/jbpm/pvm/hibernate.job.hbm.xml" /> - <mapping resource="org/jbpm/jpdl/hibernate.jpdl.hbm.xml" /> - <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" usage="nonstrict-read-write" /> </hibernate-configuration> @@ -43,7 +43,7 @@ <job-test-helper /> <id-generator /> - <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> + <variable-types resource="jbpm.pvm.types.xml" /> <business-calendar> <monday hours="9:00-12:00 and 12:30-17:00"/>