April 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r4404 - jbpm4/trunk/modules/userguide/src/main/docbook/en/modules.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-03 08:01:11 -0400 (Fri, 03 Apr 2009) New Revision: 4404 Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml Log: documenting the task examples Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml 2009-04-03 10:45:02 UTC (rev 4403) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml 2009-04-03 12:01:11 UTC (rev 4404) @@ -824,6 +824,8 @@ <para>Creates a task for a person in the task component. </para> + +  <section id="taskassignee"> <title><literal>task</literal> assignee</title> @@ -915,6 +917,8 @@ </para> </section> +  + <section id="taskcandidates"> <title><literal>task</literal> candidates</title> <para>A task that will be offered to a group of users. One of the users should then @@ -1010,6 +1014,8 @@ </para> </section> +  + <section id="taskassignmenthandler"> <title><literal>task</literal> assignment handler</title> <para>An <literal>AssignmentHandler</literal> can be used to calculate the @@ -1024,30 +1030,15 @@ Swimlanes. So AssignmentHandlers can be used for tasks as well as swimlanes (see later). </para> - <para><literal>task-handler</literal> is a sub element of the task element.</para> - <table><title><literal>task-handler</literal> attributes:</title> - <tgroup cols="5" rowsep="1" colsep="1"> - <thead> - <row> - <entry>Attribute</entry> - <entry>Type</entry> - <entry>Default</entry> - <entry>Required?</entry> - <entry>Description</entry> - </row> - </thead> - <tbody> - <row> - <entry><literal>class</literal></entry> - <entry>swimlane (string)</entry> - <entry></entry> - <entry>optional</entry> - <entry>refers to a swimlane that is declared in the process</entry> - </row> - </tbody> - </tgroup> - </table> + <para><literal>assignment-handler</literal> is a sub element of the task element. + It specifies a user code object. So the attributes and elements of <literal>assignment-handler</literal> + are documented in <xref linkend="usercode" /> + </para> <para>Let's look at the task assignment example process.</para> + <figure id="process.task.assignmenthandler"> + <title>The task assignment handler example process</title> + <mediaobject><imageobject><imagedata align="center" fileref="images/process.task.png"/></imageobject></mediaobject> + </figure> <programlisting><process name="TaskAssignmentHandler" xmlns="http://jbpm.org/4/jpdl"> <start g="20,20,48,48"> @@ -1066,9 +1057,29 @@ <state name="wait" g="255,16,88,52" /> </process></programlisting> - <para></para> + <para>The referenced class <literal>AssignTask</literal> looks like this: </para> + <programlisting>public class AssignTask implements AssignmentHandler { + + String assignee; + + public void assign(Assignable assignable, OpenExecution execution) { + assignable.setAssignee(assignee); + } +}</programlisting> + <para>Please note that potentially, AssignmentHandler implementations can use + the process variables and any other Java API to access resources like your + application database to calculate the assignee and candidate users and groups. + </para> + <para>Starting a new process instance of the <literal>TaskAssignmentHandler</literal> + process will immediately bring the new execution to the task activity. A new + <literal>review</literal> task is created and at that point, the <literal>AssignTask</literal> + assignment handler is called. That will set <literal>johndoe</literal> as + the assignee. So John Doe will find the task in his personal task list. + </para> </section> +  + <section id="taskswimlanes"> <title><literal>task</literal> swimlanes</title> <para>Multiple tasks in a process should be assigned to the same @@ -1211,6 +1222,33 @@ would release the task and offer it back to the other candidates. </para> </section> + +  + + <section id="taskvariables"> + <title><literal>task</literal> variables</title> + <para>Tasks can see and update process variables. Later tasks will have + the option to declare task-local process variables. Task variables + are an important part of the task forms. Task forms typically show + data that comes from the task and the process instance. Then + input from the user is translated in setting task variables. + </para> + <para>Getting task variables can be done like this:</para> + <programlisting>List<Task> taskList = taskService.findAssignedTasks("johndoe"); + +Task task = taskList.get(0); +long taskDbid = task.getDbid(); + +Set<String> variableNames = taskService.getVariableNames(taskDbid); + +Map<String, Object> variables = taskService.getVariables(taskDbid, variableNames);</programlisting> + <para>And setting task variables can be done like this:</para> + <programlisting>variables = new HashMap<String, Object>(); +variables.put("category", "small"); +variables.put("lires", 923874893); + +taskService.setVariables(taskDbid, variables);</programlisting> + </section> </section>

17 years

1
0
0 / 0

JBoss JBPM SVN: r4403 - in jbpm4/trunk/modules: examples/src/test/java/org/jbpm/examples/task/swimlane and 3 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-03 06:45:02 -0400 (Fri, 03 Apr 2009) New Revision: 4403 Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml Log: documenting the task assignment examples Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-04-03 03:32:16 UTC (rev 4402) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-04-03 10:45:02 UTC (rev 4403) @@ -39,16 +39,16 @@ deploy("jbpm-TaskCandidatesTest.jpdl"); - if(identityService.findGroupById("sales-test-group")==null) + if(identityService.findGroupById("sales-dept")==null) { // create johndoe and joesmoe as members of the sales group - identityService.createGroup("sales-test-group"); + identityService.createGroup("sales-dept"); identityService.createUser("johndoe", "johndoe", "John", "Doe"); - identityService.createMembership("johndoe", "sales-test-group"); + identityService.createMembership("johndoe", "sales-dept"); identityService.createUser("joesmoe", "joesmoe", "Joe", "Smoe"); - identityService.createMembership("joesmoe", "sales-test-group"); + identityService.createMembership("joesmoe", "sales-dept"); } } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-04-03 03:32:16 UTC (rev 4402) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-04-03 10:45:02 UTC (rev 4403) @@ -37,13 +37,13 @@ super.setUp(); deploy("jbpm-TaskSwimlaneTest.jpdl"); - if(identityService.findGroupById("sales-test-group")==null) + if(identityService.findGroupById("sales-dept")==null) { // create johndoe and joesmoe as members of the sales group - identityService.createGroup("sales-test-group"); + identityService.createGroup("sales-dept"); identityService.createUser("johndoe", "johndoe", "John", "Doe"); - identityService.createMembership("johndoe", "sales-test-group"); + identityService.createMembership("johndoe", "sales-dept"); } } Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml 2009-04-03 03:32:16 UTC (rev 4402) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/candidates/process.jpdl.xml 2009-04-03 10:45:02 UTC (rev 4403) @@ -7,7 +7,7 @@ </start> <task name="review" - candidate-groups="sales-test-group" + candidate-groups="sales-dept" g="96,16,127,52"> <transition to="wait" /> Modified: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml 2009-04-03 03:32:16 UTC (rev 4402) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/task/swimlane/process.jpdl.xml 2009-04-03 10:45:02 UTC (rev 4403) @@ -3,7 +3,7 @@ <process name="TaskSwimlane" xmlns="http://jbpm.org/4/jpdl"> <swimlane name="sales representative" - candidate-groups="sales-test-group" /> + candidate-groups="sales-dept" /> <start g="20,20,48,48"> <transition to="enter order data" /> Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml 2009-04-03 03:32:16 UTC (rev 4402) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch05-Jpdl.xml 2009-04-03 10:45:02 UTC (rev 4403) @@ -526,6 +526,8 @@ </process></programlisting> </section> +  + <section id="end"> <title><literal>end</literal></title> <para>Ends the execution. @@ -688,6 +690,8 @@ respectively.</para> </section> </section> + +  <section id="java"> <title><literal>java</literal></title> @@ -813,6 +817,8 @@ </para> </section> +  + <section id="task"> <title><literal>task</literal></title> @@ -843,18 +849,11 @@ <entry>userId referring to the person that is responsible for completing this task.</entry> </row> - <row> - <entry><literal>assignee-lang</literal></entry> - <entry>expression language</entry> - <entry>juel</entry> - <entry>optional</entry> - <entry>expression language used in the assignee attribute</entry> - </row> </tbody> </tgroup> </table> - <figure id="process.task"> - <title>The task example process</title> + <figure id="process.task.assignee"> + <title>The task assignee example process</title> <mediaobject><imageobject><imagedata align="center" fileref="images/process.task.png"/></imageobject></mediaobject> </figure> <programlisting><process name="TaskAssignee"> @@ -864,7 +863,7 @@ </start> <task name="review" - assignee="#{order.owner}"> + <emphasis role="bold">assignee="#{order.owner}"</emphasis>> <transition to="wait" /> </task> @@ -906,7 +905,8 @@ variable.</para> <programlisting>Map<String, Object> variables = new HashMap<String, Object>(); variables.put("order", new Order("johndoe")); -Execution execution = executionService.startProcessInstanceByKey("TaskAssignee", variables);</programlisting> +Execution execution = executionService + .startProcessInstanceByKey("TaskAssignee", variables);</programlisting> <para>Then the task list for <literal>johndoe</literal> can be obtained like this.</para> <programlisting>List<Task> taskList = taskService.findAssignedTasks("johndoe");</programlisting> <para>Note that it is also possible to put plain text like @@ -920,10 +920,301 @@ <para>A task that will be offered to a group of users. One of the users should then take the task in order to complete it. </para> - <para>TODO</para> + <table><title><literal>task</literal> attributes:</title> + <tgroup cols="5" rowsep="1" colsep="1"> + <thead> + <row> + <entry>Attribute</entry> + <entry>Type</entry> + <entry>Default</entry> + <entry>Required?</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry><literal>candidate-groups</literal></entry> + <entry>expression</entry> + <entry></entry> + <entry>optional</entry> + <entry>resolves to a comma separated list of groupIds. + All the people in the groups will be candidates for this + task.</entry> + </row> + <row> + <entry><literal>candidate-users</literal></entry> + <entry>expression</entry> + <entry></entry> + <entry>optional</entry> + <entry>resolves to a comma separated list of userIds. + All the users will be candidates for this task.</entry> + </row> + </tbody> + </tgroup> + </table> + <figure id="process.task.candidates"> + <title>The task candidates example process</title> + <mediaobject><imageobject><imagedata align="center" fileref="images/process.task.png"/></imageobject></mediaobject> + </figure> + <para>Here's an example process using task candidates:</para> + <programlisting><process name="TaskCandidates"> + + <start> + <transition to="review" /> + </start> + + <task name="review" + <emphasis role="bold">candidate-groups="sales-dept"</emphasis>> + + <transition to="wait" /> + </task> + + <state name="wait"/> + +</process> + </programlisting> + <para>After starting, a task will be created. The task will not show up in anyone's + personal task list. Following task lists will be empty. + </para> + <programlisting>taskService.getAssignedTasks("johndoe"); +taskService.getAssignedTasks("joesmoe");</programlisting> + <para>But the task will show up in the takable task list of all members of the <literal>sales-dept</literal> + group. + </para> + <para>The in our example, the <literal>sales-dept</literal> has two members: johndoe and joesmoe</para> + <programlisting>identityService.createGroup("sales-dept"); + +identityService.createUser("johndoe", "johndoe", "John", "Doe"); +identityService.createMembership("johndoe", "sales-dept"); + +identityService.createUser("joesmoe", "joesmoe", "Joe", "Smoe"); +identityService.createMembership("joesmoe", "sales-dept"); </programlisting> + <para>So after the process is created, the task will appear in both the + takable tasks for users johndoe and joesmoe</para> + <programlisting>taskService.findTakableTasks("johndoe"); +taskService.findTakableTasks("joesmoe");</programlisting> + <para>Candidates must take a task before they can work on it. This will prevent + that two candides start working on the same task. The user interface must only + offer the action 'Take' for the tasks in the takable task list. + </para> + <programlisting>taskService.takeTask(task.getDbid(), "johndoe");</programlisting> + <para>When a user takes a task, the assignee of that task will be set to the given + user. The task will disappear from all the candidate's takable task list and + it will appear in the user's assigned tasks. + </para> + <para>Users are only allowed to work on tasks in their personal task list. This + should be enforced by the user interface.</para> + <para>Similarly, the attribute <literal>candidate-users</literal> can be used that + resolves to a comma separated list of userIds. The <literal>candidate-users</literal> + attribute can be used in combination with other assignment options. + </para> </section> + + <section id="taskassignmenthandler"> + <title><literal>task</literal> assignment handler</title> + <para>An <literal>AssignmentHandler</literal> can be used to calculate the + assignee and the candidates for a task programmatically. + </para> + <programlisting>public interface <emphasis role="bold">AssignmentHandler</emphasis> extends Serializable { + + /** sets the actorId and candidates for the given assignable. */ + void assign(Assignable assignable, OpenExecution execution) throws Exception; +}</programlisting> + <para><literal>Assignable</literal> is a common interface for Tasks and + Swimlanes. So AssignmentHandlers can be used for tasks as well as swimlanes + (see later). + </para> + <para><literal>task-handler</literal> is a sub element of the task element.</para> + <table><title><literal>task-handler</literal> attributes:</title> + <tgroup cols="5" rowsep="1" colsep="1"> + <thead> + <row> + <entry>Attribute</entry> + <entry>Type</entry> + <entry>Default</entry> + <entry>Required?</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry><literal>class</literal></entry> + <entry>swimlane (string)</entry> + <entry></entry> + <entry>optional</entry> + <entry>refers to a swimlane that is declared in the process</entry> + </row> + </tbody> + </tgroup> + </table> + <para>Let's look at the task assignment example process.</para> + <programlisting><process name="TaskAssignmentHandler" xmlns="http://jbpm.org/4/jpdl"> + + <start g="20,20,48,48"> + <transition to="review" /> + </start> + + <task name="review" g="96,16,127,52"> + <emphasis role="bold"><assignment-handler class="org.jbpm.examples.task.assignmenthandler.AssignTask"> + <field name="assignee"> + <string value="johndoe" /> + </field> + </assignment-handler></emphasis> + <transition to="wait" /> + </task> + + <state name="wait" g="255,16,88,52" /> + +</process></programlisting> + <para></para> + </section> + + <section id="taskswimlanes"> + <title><literal>task</literal> swimlanes</title> + <para>Multiple tasks in a process should be assigned to the same + user or candidates. Multiple tasks in a process can be associated to a + single swimlane. The process instance will remember the candidates and user + that performed the first task in the swimlane. And subsequent tasks in the + same swimlane will be assigned to those user and candidates. + </para> + <para>A swimlane can also be considered as a process role. In some + cases, this might boil down to authorization roles in the + identity component. But bare in mind that it is not always the + same thing.</para> + <table><title><literal>task</literal> attributes:</title> + <tgroup cols="5" rowsep="1" colsep="1"> + <thead> + <row> + <entry>Attribute</entry> + <entry>Type</entry> + <entry>Default</entry> + <entry>Required?</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry><literal>swimlane</literal></entry> + <entry>swimlane (string)</entry> + <entry></entry> + <entry>optional</entry> + <entry>refers to a swimlane that is declared in the process</entry> + </row> + </tbody> + </tgroup> + </table> + <para>Swimlanes can be declared inside a process element:</para> + <table><title><literal>swimlane</literal> attributes:</title> + <tgroup cols="5" rowsep="1" colsep="1"> + <thead> + <row> + <entry>Attribute</entry> + <entry>Type</entry> + <entry>Default</entry> + <entry>Required?</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry><literal>name</literal></entry> + <entry>swimlane (string)</entry> + <entry></entry> + <entry><emphasis role="bold">required</emphasis></entry> + <entry>Name for this swimlane. This is the + name that will be referenced by task swimlane attributes. + </entry> + </row> + <row> + <entry><literal>assignee</literal></entry> + <entry>expression</entry> + <entry></entry> + <entry>optional</entry> + <entry>userId referring to the person that is responsible for + completing this task.</entry> + </row> + <row> + <entry><literal>candidate-groups</literal></entry> + <entry>expression</entry> + <entry></entry> + <entry>optional</entry> + <entry>resolves to a comma separated list of groupIds. + All the people in the groups will be candidates for this + the tasks in this swimlane.</entry> + </row> + <row> + <entry><literal>candidate-users</literal></entry> + <entry>expression</entry> + <entry></entry> + <entry>optional</entry> + <entry>resolves to a comma separated list of userIds. + All the users will be candidates for the + tasks in this swimlane.</entry> + </row> + </tbody> + </tgroup> + </table> + <figure id="process.task.swimlane"> + <title>The task swimlane example process</title> + +  + + <mediaobject><imageobject><imagedata align="center" fileref="images/process.task.png"/></imageobject></mediaobject> + </figure> + <para>The task swimlane example has the following process file :</para> + <programlisting><process name="TaskSwimlane" xmlns="http://jbpm.org/4/jpdl"> + + <emphasis role="bold"><swimlane name="sales representative" + candidate-groups="sales-dept" /></emphasis> + + <start> + <transition to="enter order data" /> + </start> + + <task name="enter order data" + <emphasis role="bold">swimlane="sales representative"</emphasis>> + + <transition to="calculate quote"/> + </task> + + <task + name="calculate quote" + <emphasis role="bold">swimlane="sales representative"</emphasis>> + </task> + +</process></programlisting> + <para>In this example we create the following information in the identity + component:</para> + <programlisting>identityService.createGroup("sales-dept"); + +identityService.createUser("johndoe", "johndoe", "John", "Doe"); +identityService.createMembership("johndoe", "sales-dept");</programlisting> + <para>After starting a new process instance, user <literal>johndoe</literal> will + be a candidate for task <literal>enter order data</literal>. Again like in the + previous task candidates example, John Doe can now take this task like this: + </para> + <programlisting>taskService.takeTask(taskDbid, "johndoe");</programlisting> + <para>Taking the task will make Lit<literal>johndoe</literal> the assignee for + the task. And since this task is coupled to the swimlane + <literal>sales representative</literal>, assignee <literal>johndoe</literal> will + also be propagated as the assignee in the swimlane.</para> + <para>Next, John Doe can complete the task like this:</para> + <programlisting>taskService.completeTask(taskDbid);</programlisting> + <para>Completing the task will bring the process execution to the + next task, which is <literal>calculate quote</literal>. Also + this task is linked to the swimlane. Therefore, the task will be + assigned to <literal>johndoe</literal>. Also the candidate users + and candidate groups of the initial assignment will be copied from + the swimlane to the task. This is relevant in case user <literal>johndoe</literal> + would release the task and offer it back to the other candidates. + </para> + </section> </section> +  + <section id="script"> <title><literal>script</literal></title> <para>A script activity evaluates a script. Scripts can be specified in any language for @@ -1111,6 +1402,8 @@ </para> </section> +  + <section id="esb"> <title><literal>esb</literal></title> <para>An <literal>esb</literal> activity sends a message to a service over the ESB. @@ -1200,6 +1493,8 @@ </para> </section> +  + <section id="hql"> <title><literal>hql</literal></title> <para>With the<literal>hql</literal> activity, a HQL query can be performed @@ -1300,6 +1595,8 @@ </process></programlisting> </section> +  + <section id="sql"> <title><literal>sql</literal></title> <para>The <literal>sql</literal> activity is exactly the same as the @@ -1356,4 +1653,100 @@ </section> </section> + <section id="usercode"> + <title>User code</title> + <para>Various elements in the jPDL process language refer to a an + object on which an interface method will be invoked. See for example + <xref linkend="taskassignmenthandler" />. This section describes the + attributes and sub elements of those type of user code objects. + </para> + <table><title>attributes:</title> + <tgroup cols="5" rowsep="1" colsep="1"> + <thead> + <row> + <entry>Attribute</entry> + <entry>Type</entry> + <entry>Default</entry> + <entry>Required?</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry><literal>class</literal></entry> + <entry>classname</entry> + <entry></entry> + <entry><emphasis role="bold">required</emphasis></entry> + <entry>The fully qualified classname.</entry> + </row> + </tbody> + </tgroup> + </table> + <table><title>sub elements:</title> + <tgroup cols="3" rowsep="1" colsep="1"> + <thead> + <row> + <entry>Element</entry> + <entry>Multiplicity</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry><literal>field</literal></entry> + <entry>0..*</entry> + <entry>describes a configuration value to be injected directly in + a memberfield before this user class is used.</entry> + </row> + <row> + <entry><literal>property</literal></entry> + <entry>0..*</entry> + <entry>describes a configuration value to injected through a setter + method before this user object is used.</entry> + </row> + </tbody> + </tgroup> + </table> + <table><title><literal>field</literal> attributes:</title> + <tgroup cols="5" rowsep="1" colsep="1"> + <thead> + <row> + <entry>Attribute</entry> + <entry>Type</entry> + <entry>Default</entry> + <entry>Required?</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry><literal>name</literal></entry> + <entry>string</entry> + <entry></entry> + <entry><emphasis role="bold">required</emphasis></entry> + <entry>the name of the field</entry> + </row> + </tbody> + </tgroup> + </table> + <table><title><literal>field</literal> sub elements:</title> + <tgroup cols="3" rowsep="1" colsep="1"> + <thead> + <row> + <entry>Element</entry> + <entry>Multiplicity</entry> + <entry>Description</entry> + </row> + </thead> + <tbody> + <row> + <entry><literal>string</literal></entry> + <entry>0..1</entry> + <entry>represents a string value</entry> + </row> + </tbody> + </tgroup> + </table> + </section> + </chapter>

17 years

1
0
0 / 0

JBoss JBPM SVN: r4402 - jbpm4/trunk/modules/userguide/src/main/docbook/en/images.

by do-not-reply＠jboss.org

Author: koen.aers(a)jboss.com Date: 2009-04-02 23:32:16 -0400 (Thu, 02 Apr 2009) New Revision: 4402 Added: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.open.in.xml.png Log: restore accidentally deleted Added: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.open.in.xml.png =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.open.in.xml.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

17 years

1
0
0 / 0

JBoss JBPM SVN: r4401 - jbpm4/trunk/modules/userguide/src/main/docbook/en/modules.

by do-not-reply＠jboss.org

Author: koen.aers(a)jboss.com Date: 2009-04-02 23:07:36 -0400 (Thu, 02 Apr 2009) New Revision: 4401 Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch03-Gpd.xml Log: include source tab description Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch03-Gpd.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch03-Gpd.xml 2009-04-03 03:06:26 UTC (rev 4400) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch03-Gpd.xml 2009-04-03 03:07:36 UTC (rev 4401) @@ -33,7 +33,14 @@ <section id="editingtheprocesssource"> <title>Editing the process source</title> - <para>To edit the process XML sources directly, select the process file, right click + <para>The GPD contains a 'Source' tab with the XML sources. These are directly editable in + this tab and the graphical view will reflect the changes when you switch back to the diagram.</para> + <figure id="gpd.source.tab"> + <title>Editing jPDL using the source view</title> + <mediaobject><imageobject><imagedata align="center" fileref="images/gpd.xml.view.png"/></imageobject></mediaobject> + </figure> + <para>You can of course still edit the process XML sources using the built in XML editor. + To do this, select the process file, right click and select 'Open with...' --> 'XML editor' </para> <figure id="gpd.open.in.xml"> @@ -43,7 +50,7 @@ <para>After you've done this, eclipse will remember that and the next time you double click it, eclipse will open your process file in the XML Editor automatically. To open up the process file in the GPD, perform the - same Open-with-action, but select 'jPDL 4 Editor' + same Open-with-action, but select 'jBPM jPDL 4 Editor' </para> </section>

17 years

1
0
0 / 0

JBoss JBPM SVN: r4400 - jbpm4/trunk/modules/userguide/src/main/docbook/en/images.

by do-not-reply＠jboss.org

Author: koen.aers(a)jboss.com Date: 2009-04-02 23:06:26 -0400 (Thu, 02 Apr 2009) New Revision: 4400 Added: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.xml.view.png Removed: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.open.in.xml.png Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.new.process.file.png jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.new.process.wizard.png jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.png jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.concurrency.png jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.end.multiple.png jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.end.processinstance.png jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.end.state.png jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.esb.png jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.exclusive.png jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.hql.png jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.java.png jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.script.png jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.state.choice.png jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.state.sequence.png jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.task.png Log: image updates for user guide Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.new.process.file.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.new.process.wizard.png =================================================================== (Binary files differ) Deleted: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.open.in.xml.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.png =================================================================== (Binary files differ) Added: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.xml.view.png =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/gpd.xml.view.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.concurrency.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.end.multiple.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.end.processinstance.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.end.state.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.esb.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.exclusive.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.hql.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.java.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.script.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.state.choice.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.state.sequence.png =================================================================== (Binary files differ) Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/images/process.task.png =================================================================== (Binary files differ)

17 years

1
0
0 / 0

JBoss JBPM SVN: r4399 - in jbpm3/trunk/hudson: hudson-home/jobs/jBPM3-Container-Matrix and 1 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-04-02 19:19:27 -0400 (Thu, 02 Apr 2009) New Revision: 4399 Modified: jbpm3/trunk/hudson/ant.properties.example jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml Log: replace hudson TimerTrigger with SCMTrigger Modified: jbpm3/trunk/hudson/ant.properties.example =================================================================== --- jbpm3/trunk/hudson/ant.properties.example 2009-04-02 22:50:29 UTC (rev 4398) +++ jbpm3/trunk/hudson/ant.properties.example 2009-04-02 23:19:27 UTC (rev 4399) @@ -18,23 +18,22 @@ hudson.username=changeme hudson.password=changeme -hudson.maven.path=/usr/java/apache-maven-2.0.9 - hudson.root=/home/hudson/workspace +hudson.maven.path=/usr/java/apache-maven-2.0.9 hudson.maven.profile=$JBPMDIR/hudson/profiles.xml.local.qa hudson.host=jbpm.dyndns.org -hudson.admin.port=8150 hudson.http.port=8180 +hudson.admin.port=8150 -#hudson.jboss422.zip=file:///home/hudson/download/java/jboss/jboss-4.2.2.GA.zip -#hudson.jboss423.zip=file:///home/hudson/download/java/jboss/jboss-4.2.3.GA.zip -#hudson.jboss500.zip=file:///home/hudson/download/java/jboss/jboss-5.0.0.GA.zip +#hudson.jboss422.zip=file:/home/hudson/download/java/jboss/jboss-4.2.2.GA.zip +#hudson.jboss423.zip=file:/home/hudson/download/java/jboss/jboss-4.2.3.GA.zip +#hudson.jboss500.zip=file:/home/hudson/download/java/jboss/jboss-5.0.0.GA.zip hudson.mail.recipients= hudson.smtp.host=localhost -# Hudson (1.270) +# Hudson (1.295) apache-tomcat=5.5.20 -sun-hudson=2402/122511 +sun-hudson=2402/131374 Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-04-02 22:50:29 UTC (rev 4398) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-04-02 23:19:27 UTC (rev 4399) @@ -26,9 +26,9 @@ <canRoam>true</canRoam> <disabled>false</disabled> <triggers class="vector"> - <hudson.triggers.TimerTrigger> - <spec>0 21 * * *</spec> - </hudson.triggers.TimerTrigger> + <hudson.triggers.SCMTrigger> + <spec>0 2 * * *</spec> + </hudson.triggers.SCMTrigger> </triggers> <axes> <axis> Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-04-02 22:50:29 UTC (rev 4398) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-04-02 23:19:27 UTC (rev 4399) @@ -26,9 +26,9 @@ <canRoam>true</canRoam> <disabled>false</disabled> <triggers class="vector"> - <hudson.triggers.TimerTrigger> + <hudson.triggers.SCMTrigger> <spec>0 0 * * *</spec> - </hudson.triggers.TimerTrigger> + </hudson.triggers.SCMTrigger> </triggers> <axes> <axis>

17 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4398 - in jbpm3/trunk: hudson and 35 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-04-02 18:50:29 -0400 (Thu, 02 Apr 2009) New Revision: 4398 Added: jbpm3/trunk/modules/core/src/main/resources/jbpm-oracle-ds.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Join.lock.hbm.xml jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2094/ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/ jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml jbpm3/trunk/modules/db/src/main/resources/oracle.properties Removed: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/jpdl/xml/jpdl-3.3.xsd jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2094/EsbActionHandler.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml Modified: jbpm3/trunk/hudson/hudson-home/command.sh jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml jbpm3/trunk/hudson/profiles.xml.local.qa jbpm3/trunk/modules/core/pom.xml jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.oracle.xml jbpm3/trunk/modules/core/src/main/resources/jbpm-mysql-ds.xml jbpm3/trunk/modules/core/src/main/resources/jbpm-postgresql-ds.xml jbpm3/trunk/modules/core/src/main/resources/jbpm-sybase-ds.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/Action.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Decision.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Fork.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Join.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/ExecuteActionJob.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/ExecuteNodeJob.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Timer.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/scheduler/def/CreateTimerAction.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Swimlane.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskController.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/log/TaskLog.hbm.xml jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/JoinDbTest.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/job/executor/JobExecutorDbTest.java jbpm3/trunk/modules/core/src/test/resources/log4j.xml jbpm3/trunk/modules/db/pom.xml jbpm3/trunk/modules/db/scripts/antrun-jbpmschema.xml jbpm3/trunk/modules/db/src/main/resources/postgresql.properties jbpm3/trunk/modules/db/src/main/resources/sybase.properties jbpm3/trunk/modules/distribution/pom.xml jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/user-input-spec.xml jbpm3/trunk/modules/enterprise/pom.xml jbpm3/trunk/modules/userguide/pom.xml jbpm3/trunk/pom.xml Log: merge r4346:4349, r4351:4371 from branch 3.2.5.SP Modified: jbpm3/trunk/hudson/hudson-home/command.sh =================================================================== --- jbpm3/trunk/hudson/hudson-home/command.sh 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/hudson/hudson-home/command.sh 2009-04-02 22:50:29 UTC (rev 4398) @@ -12,15 +12,15 @@ case "$CONTAINER" in jboss422*) JBOSS_BUILD=jboss-4.2.2.GA - ;; + ;; jboss423*) JBOSS_BUILD=jboss-4.2.3.GA - ;; + ;; jboss500*) JBOSS_BUILD=jboss-5.0.0.GA - ;; + ;; esac # @@ -44,7 +44,7 @@ fi # -# build the tests +# Build the tests # MVN_CMD="mvn -o $ENVIRONMENT process-test-classes" echo $MVN_CMD; $MVN_CMD 2>&1; MVN_STATUS=$? @@ -67,16 +67,22 @@ cp $JBOSS_HOME/docs/examples/jbpm/jbpm-$DATABASE-ds.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.xml cp $JBOSS_HOME/docs/examples/jbpm/hibernate.cfg.$DATABASE.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml -# FIXME: find out whether jTDS can be made to work with XA data source -# https://jira.jboss.org/jira/browse/JBPM-1818 +# Install Sybase JDBC driver manually, as the distribution cannot contain it SYBASE_JDBC_DRIVER=~/.m2/repository/com/sybase/jconnect/6.0.5/jconnect-6.0.5.jar if [ -f $SYBASE_JDBC_DRIVER ]; then echo "cp $SYBASE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" cp $SYBASE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar fi +# Install Oracle JDBC driver manually, as the distribution cannot contain it +ORACLE_JDBC_DRIVER=~/.m2/repository/com/oracle/ojdbc14/10.2.0.4/ojdbc14-10.2.0.4.jar +if [ -f $ORACLE_JDBC_DRIVER ]; then + echo "cp $ORACLE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar" + cp $ORACLE_JDBC_DRIVER $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar +fi + # -# start jbossas +# Start JBoss AS # $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR @@ -89,13 +95,13 @@ fi # -# log dependency tree +# Log dependency tree # MVN_CMD="mvn -o $ENVIRONMENT dependency:tree" echo $MVN_CMD; $MVN_CMD | tee $WORKSPACE/dependency-tree.txt # -# execute tests +# Execute tests # MVN_CMD="mvn -o -fae $ENVIRONMENT test" echo $MVN_CMD; $MVN_CMD 2>&1 | tee $WORKSPACE/tests.log @@ -103,7 +109,7 @@ cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt || : # -# stop jbossas +# Stop JBoss AS # $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop cp $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE/jboss-boot.log Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Container-Matrix/config.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -41,8 +41,8 @@ <axis> <name>database</name> <values> - <string>hsqldb</string> - <string>mysql</string> + <string>sybase</string> + <string>oracle</string> </values> </axis> <axis> Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml =================================================================== --- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-Database-Matrix/config.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -44,6 +44,7 @@ <string>mysql</string> <string>postgresql</string> <string>sybase</string> + <string>oracle</string> </values> </axis> <axis> Modified: jbpm3/trunk/hudson/profiles.xml.local.qa =================================================================== --- jbpm3/trunk/hudson/profiles.xml.local.qa 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/hudson/profiles.xml.local.qa 2009-04-02 22:50:29 UTC (rev 4398) @@ -13,7 +13,6 @@ </activation> <properties> - <jdbc.mysql.server>localhost</jdbc.mysql.server> <jdbc.mysql.port>3306</jdbc.mysql.port> <jdbc.mysql.database>jbpmtest</jdbc.mysql.database> @@ -37,8 +36,14 @@ <jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username> <jdbc.postgresql.password></jdbc.postgresql.password> + <jdbc.oracle.server>localhost</jdbc.oracle.server> + <jdbc.oracle.port>1521</jdbc.oracle.port> + <jdbc.oracle.database>XE</jdbc.oracle.database> + <jdbc.oracle.url>jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:${jdbc.oracle.database}</jdbc.oracle.url> + <jdbc.oracle.username>jbpmtest</jdbc.oracle.username> + <jdbc.oracle.password>jbpmtest</jdbc.oracle.password> </properties> </profile> - + </profiles> </profilesXml> Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/pom.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -198,27 +198,27 @@ <id>soa</id> <build> <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>process-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="database" value="${database}" /> - <ant antfile="scripts/antrun-jbpm-config.xml" target="generate-jbpm-cfg-soa" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="database" value="${database}" /> + <ant antfile="scripts/antrun-jbpm-config.xml" target="generate-jbpm-cfg-soa" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </profile> - +  + <profile> + <id>oracle</id> + <activation> + <property> + <name>database</name> + <value>oracle</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.oracle.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.oracle.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.oracle.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -1,12 +1,10 @@  - <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> + <property name="hibernate.dialect">org.hibernate.dialect.Oracle10gDialect</property>  -  <property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property> <property name="hibernate.connection.url">${jdbc.oracle.url}</property> <property name="hibernate.connection.username">${jdbc.oracle.username}</property> <property name="hibernate.connection.password">${jdbc.oracle.password}</property>  - Modified: jbpm3/trunk/modules/core/src/main/resources/jbpm-mysql-ds.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/jbpm-mysql-ds.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/jbpm-mysql-ds.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<datasources> +<datasources> <xa-datasource> <jndi-name>JbpmDS</jndi-name> @@ -13,7 +13,7 @@  <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> -  +  <no-tx-separate-pools />  <track-connection-by-tx /> @@ -31,5 +31,4 @@ <type-mapping>mySQL</type-mapping> </metadata> </xa-datasource> - </datasources> \ No newline at end of file Copied: jbpm3/trunk/modules/core/src/main/resources/jbpm-oracle-ds.xml (from rev 4349, jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/jbpm-oracle-ds.xml) =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/jbpm-oracle-ds.xml (rev 0) +++ jbpm3/trunk/modules/core/src/main/resources/jbpm-oracle-ds.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<datasources> + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class> + <xa-datasource-property name="URL">${jdbc.oracle.url}</xa-datasource-property> + <user-name>${jdbc.oracle.username}</user-name> + <password>${jdbc.oracle.password}</password> + +  + <no-tx-separate-pools /> +  + <track-connection-by-tx /> + + <isSameRM-override-value>false</isSameRM-override-value> + +  + <exception-sorter-class-name> + org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter + </exception-sorter-class-name> +  + <valid-connection-checker-class-name> + org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker + </valid-connection-checker-class-name> + +  + <metadata> + <type-mapping>Oracle9i</type-mapping> + </metadata> + </xa-datasource> + + <mbean code="org.jboss.resource.adapter.jdbc.vendor.OracleXAExceptionFormatter" + name="jboss.jca:service=OracleXAExceptionFormatter"> + <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends> + </mbean> +</datasources> \ No newline at end of file Modified: jbpm3/trunk/modules/core/src/main/resources/jbpm-postgresql-ds.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/jbpm-postgresql-ds.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/jbpm-postgresql-ds.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<datasources> +<datasources> <xa-datasource> <jndi-name>JbpmDS</jndi-name> @@ -19,5 +19,4 @@ <type-mapping>PostgreSQL 8.0</type-mapping> </metadata> </xa-datasource> - </datasources> Modified: jbpm3/trunk/modules/core/src/main/resources/jbpm-sybase-ds.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/jbpm-sybase-ds.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/jbpm-sybase-ds.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <datasources> - <xa-datasource> <jndi-name>JbpmDS</jndi-name> @@ -12,6 +11,8 @@ <user-name>${jdbc.sybase.username}</user-name> <password>${jdbc.sybase.password}</password> +  + <no-tx-separate-pools />  <track-connection-by-tx /> @@ -24,5 +25,4 @@ <type-mapping>Sybase</type-mapping> </metadata> </xa-datasource> - </datasources> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -5,15 +5,18 @@ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping auto-import="false" default-access="field"> - <subclass name="org.jbpm.context.exe.variableinstance.ByteArrayInstance" - extends="org.jbpm.context.exe.VariableInstance" + + <subclass name="org.jbpm.context.exe.variableinstance.ByteArrayInstance" + extends="org.jbpm.context.exe.VariableInstance" discriminator-value="B"> - - <many-to-one name="value" + + <many-to-one name="value" class="org.jbpm.bytes.ByteArray" column="BYTEARRAYVALUE_" cascade="all" - foreign-key="FK_BYTEINST_ARRAY" /> + foreign-key="FK_BYTEINST_ARRAY" + index="IDX_BYTEINST_ARRAY" /> </subclass> + </hibernate-mapping> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -8,10 +8,12 @@ <subclass name="org.jbpm.context.log.VariableLog" extends="org.jbpm.logging.log.ProcessLog" discriminator-value="V"> - + <many-to-one name="variableInstance" column="VARIABLEINSTANCE_" - foreign-key="FK_LOG_VARINST" /> + cascade="save-update" + foreign-key="FK_LOG_VARINST" + index="FK_LOG_VARINST" /> </subclass> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -14,12 +14,14 @@ class="org.jbpm.bytes.ByteArray" column="OLDBYTEARRAY_" cascade="all" - foreign-key="FK_LOG_OLDBYTES" /> + foreign-key="FK_LOG_OLDBYTES" + index="IDX_LOG_OLDBYTES" /> <many-to-one name="newValue" class="org.jbpm.bytes.ByteArray" column="NEWBYTEARRAY_" cascade="all" - foreign-key="FK_LOG_NEWBYTES" /> + foreign-key="FK_LOG_NEWBYTES" + index="IDX_LOG_NEWBYTES" /> </subclass> </hibernate-mapping> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/Action.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/Action.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/def/Action.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -23,7 +23,8 @@ <many-to-one name="referencedAction" column="REFERENCEDACTION_" cascade="all" - foreign-key="FK_ACTION_REFACT" /> + foreign-key="FK_ACTION_REFACT" + index="IDX_ACTION_REFACT" /> <many-to-one name="actionDelegation" column="ACTIONDELEGATION_" cascade="all" Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -6,12 +6,16 @@ <hibernate-mapping auto-import="false" default-access="field"> - <subclass name="org.jbpm.graph.log.ActionLog" extends="org.jbpm.logging.log.CompositeLog" discriminator-value="A"> + <subclass name="org.jbpm.graph.log.ActionLog" + extends="org.jbpm.logging.log.CompositeLog" + discriminator-value="A"> <property name="exception" column="EXCEPTION_" type="string" length="4000"/> - - <many-to-one name="action" column="ACTION_" class="org.jbpm.graph.def.Action" foreign-key="FK_LOG_ACTION" /> - + + <many-to-one name="action" + column="ACTION_" + foreign-key="FK_LOG_ACTION" + index="FK_LOG_ACTION" /> </subclass> </hibernate-mapping> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -6,12 +6,16 @@ <hibernate-mapping auto-import="false" default-access="field"> - <subclass name="org.jbpm.graph.log.ActionLog" extends="org.jbpm.logging.log.CompositeLog" discriminator-value="A"> + <subclass name="org.jbpm.graph.log.ActionLog" + extends="org.jbpm.logging.log.CompositeLog" + discriminator-value="A"> <property name="exception" column="EXCEPTION_" type="text" length="4000"/> - <many-to-one name="action" column="ACTION_" class="org.jbpm.graph.def.Action" foreign-key="FK_LOG_ACTION" /> - + <many-to-one name="action" + column="ACTION_" + foreign-key="FK_LOG_ACTION" + index="FK_LOG_ACTION" /> </subclass> </hibernate-mapping> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -12,8 +12,8 @@ <many-to-one name="node" column="NODE_" - class="org.jbpm.graph.def.Node" - foreign-key="FK_LOG_NODE" /> + foreign-key="FK_LOG_NODE" + index="IDX_LOG_NODE" /> <property name="enter" column="ENTER_" /> <property name="leave" Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/ProcessStateLog.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -9,7 +9,10 @@ <subclass name="org.jbpm.graph.log.ProcessStateLog" extends="org.jbpm.graph.log.NodeLog" discriminator-value="Z"> - <many-to-one name="subProcessInstance" column="NEWLONGVALUE_" class="org.jbpm.graph.exe.ProcessInstance" foreign-key="none" /> + + <many-to-one name="subProcessInstance" + column="NEWLONGVALUE_" + foreign-key="none" /> </subclass> </hibernate-mapping> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -9,7 +9,11 @@ <subclass name="org.jbpm.graph.log.SignalLog" extends="org.jbpm.logging.log.CompositeLog" discriminator-value="S"> - <many-to-one name="transition" column="TRANSITION_" class="org.jbpm.graph.def.Transition" foreign-key="FK_LOG_TRANSITION" /> + + <many-to-one name="transition" + column="TRANSITION_" + foreign-key="FK_LOG_TRANSITION" + index="IDX_LOG_TRANSITION" /> </subclass> </hibernate-mapping> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -9,11 +9,11 @@ <subclass name="org.jbpm.graph.log.TokenCreateLog" extends="org.jbpm.logging.log.ProcessLog" discriminator-value="O"> - + <many-to-one name="child" column="CHILD_" - class="org.jbpm.graph.exe.Token" - foreign-key="FK_LOG_CHILDTOKEN" /> + foreign-key="FK_LOG_CHILDTOKEN" + index="IDX_LOG_CHILDTOKEN" /> </subclass> </hibernate-mapping> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -12,8 +12,8 @@ <many-to-one name="child" column="CHILD_" - class="org.jbpm.graph.exe.Token" - foreign-key="FK_LOG_CHILDTOKEN" /> + foreign-key="FK_LOG_CHILDTOKEN" + index="IDX_LOG_CHILDTOKEN" /> </subclass> </hibernate-mapping> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -12,16 +12,16 @@ <many-to-one name="transition" column="TRANSITION_" - class="org.jbpm.graph.def.Transition" - foreign-key="FK_LOG_TRANSITION" /> + foreign-key="FK_LOG_TRANSITION" + index="IDX_LOG_TRANSITION" /> <many-to-one name="sourceNode" column="SOURCENODE_" - class="org.jbpm.graph.def.Node" - foreign-key="FK_LOG_SOURCENODE" /> + foreign-key="FK_LOG_SOURCENODE" + index="IDX_LOG_SOURCENODE" /> <many-to-one name="destinationNode" column="DESTINATIONNODE_" - class="org.jbpm.graph.def.Node" - foreign-key="FK_LOG_DESTNODE" /> + foreign-key="FK_LOG_DESTNODE" + index="IDX_LOG_DESTNODE" /> </subclass> </hibernate-mapping> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Decision.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Decision.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Decision.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -21,10 +21,10 @@ </list> <many-to-one name="decisionDelegation" - class="org.jbpm.instantiation.Delegation" column="DECISIONDELEGATION" foreign-key="FK_DECISION_DELEG" - cascade="all" /> + cascade="all" + index="IDX_DECISION_DELEG" /> </subclass> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Fork.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Fork.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Fork.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -12,7 +12,8 @@ <many-to-one name="script" column="SCRIPT_" foreign-key="FK_NODE_SCRIPT" - cascade="all" /> + cascade="all" + index="IDX_NODE_SCRIPT" /> </subclass> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Join.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Join.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Join.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -6,8 +6,6 @@ <hibernate-mapping auto-import="false" default-access="field" > <subclass name="org.jbpm.graph.node.Join" discriminator-value="J" - extends="org.jbpm.graph.def.Node"> - <property name="parentLockMode" column="PARENTLOCKMODE_"/> - </subclass> + extends="org.jbpm.graph.def.Node" /> </hibernate-mapping> Copied: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Join.lock.hbm.xml (from rev 4349, jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/resources/org/jbpm/graph/node/Join.lock.hbm.xml) =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Join.lock.hbm.xml (rev 0) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/graph/node/Join.lock.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping auto-import="false" default-access="field" > + + <subclass name="org.jbpm.graph.node.Join" discriminator-value="J" + extends="org.jbpm.graph.def.Node"> + <property name="parentLockMode" column="PARENTLOCKMODE_"/> + </subclass> + +</hibernate-mapping> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -15,8 +15,7 @@ <many-to-one name="processDefinition" column="PROCESSDEFINITION_" foreign-key="FK_DELEGATION_PRCD" - index="IDX_DELEG_PRCD" - cascade="none" /> + index="IDX_DELEG_PRCD" /> </class> </hibernate-mapping> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/ExecuteActionJob.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/ExecuteActionJob.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/ExecuteActionJob.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -13,7 +13,8 @@ <many-to-one name="action" column="ACTION_" cascade="none" - foreign-key="FK_JOB_ACTION"/> + foreign-key="FK_JOB_ACTION" + index="IDX_JOB_ACTION"/> </subclass> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/ExecuteNodeJob.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/ExecuteNodeJob.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/ExecuteNodeJob.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -12,8 +12,8 @@ <many-to-one name="node" column="NODE_" - cascade="none" - foreign-key="FK_JOB_NODE"/> + foreign-key="FK_JOB_NODE" + index="IDX_JOB_NODE"/> </subclass> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -15,9 +15,18 @@ <property name="dueDate" column="DUEDATE_" type="timestamp" /> - <many-to-one name="processInstance" column="PROCESSINSTANCE_" cascade="none" foreign-key="FK_JOB_PRINST" index="IDX_JOB_PRINST" /> - <many-to-one name="token" column="TOKEN_" cascade="none" foreign-key="FK_JOB_TOKEN" index="IDX_JOB_TOKEN" /> - <many-to-one name="taskInstance" column="TASKINSTANCE_" cascade="none" foreign-key="FK_JOB_TSKINST" index="IDX_JOB_TSKINST" /> + <many-to-one name="processInstance" + column="PROCESSINSTANCE_" + foreign-key="FK_JOB_PRINST" + index="IDX_JOB_PRINST" /> + <many-to-one name="token" + column="TOKEN_" + foreign-key="FK_JOB_TOKEN" + index="IDX_JOB_TOKEN" /> + <many-to-one name="taskInstance" + column="TASKINSTANCE_" + foreign-key="FK_JOB_TSKINST" + index="IDX_JOB_TSKINST" /> <property name="isSuspended" column="ISSUSPENDED_" /> <property name="isExclusive" column="ISEXCLUSIVE_" /> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Job.sybase.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -15,9 +15,18 @@ <property name="dueDate" column="DUEDATE_" type="timestamp" /> - <many-to-one name="processInstance" column="PROCESSINSTANCE_" cascade="none" foreign-key="FK_JOB_PRINST" index="IDX_JOB_PRINST" /> - <many-to-one name="token" column="TOKEN_" cascade="none" foreign-key="FK_JOB_TOKEN" index="IDX_JOB_TOKEN" /> - <many-to-one name="taskInstance" column="TASKINSTANCE_" cascade="none" foreign-key="FK_JOB_TSKINST" index="IDX_JOB_TSKINST" /> + <many-to-one name="processInstance" + column="PROCESSINSTANCE_" + foreign-key="FK_JOB_PRINST" + index="IDX_JOB_PRINST" /> + <many-to-one name="token" + column="TOKEN_" + foreign-key="FK_JOB_TOKEN" + index="IDX_JOB_TOKEN" /> + <many-to-one name="taskInstance" + column="TASKINSTANCE_" + foreign-key="FK_JOB_TSKINST" + index="IDX_JOB_TSKINST" /> <property name="isSuspended" column="ISSUSPENDED_" /> <property name="isExclusive" column="ISEXCLUSIVE_" /> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Timer.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Timer.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/job/Timer.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -16,8 +16,8 @@ <many-to-one name="action" column="ACTION_" - cascade="none" - foreign-key="FK_JOB_ACTION"/> + foreign-key="FK_JOB_ACTION" + index="IDX_JOB_ACTION"/> <any name="graphElement" id-type="long" cascade="none"> <column name="GRAPHELEMENTTYPE_"/> Deleted: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/jpdl/xml/jpdl-3.3.xsd =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/jpdl/xml/jpdl-3.3.xsd 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/jpdl/xml/jpdl-3.3.xsd 2009-04-02 22:50:29 UTC (rev 4398) @@ -1,511 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xs:schema targetNamespace="urn:jbpm.org:jpdl-3.3" - elementFormDefault="qualified" - xmlns="urn:jbpm.org:jpdl-3.3" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> - -  -  - <xs:element name="process-definition"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="description" /> - <xs:element ref="swimlane" /> - <xs:element ref="start-state" /> - <xs:group ref="node-elements"/> - <xs:group ref="action-elements" /> - <xs:element ref="event" /> - <xs:element ref="exception-handler" /> - <xs:element ref="task" /> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required" /> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="swimlane"> - <xs:complexType> - <xs:sequence minOccurs="0" maxOccurs="1"> - <xs:element ref="assignment"/> - </xs:sequence> - <xs:attribute name="name" type="xs:string" use="required" /> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="start-state"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="description" /> - <xs:element ref="task"/> - <xs:element ref="transition"/> - <xs:element ref="event"/> - <xs:element ref="exception-handler"/> - </xs:choice> - <xs:attribute name="name" type="xs:string"/> - </xs:complexType> - </xs:element> - - <xs:element name="end-state"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="description" /> - <xs:element ref="event"/> - <xs:element ref="exception-handler"/> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required"/> - <xs:attribute name="end-complete-process" type="booleanType" use="optional" default="false"/> - </xs:complexType> - </xs:element> - - <xs:element name="decision"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="description" /> - <xs:element name="handler" type="delegation" /> - <xs:element ref="event"/> - <xs:element ref="exception-handler"/> - <xs:element ref="transition"/> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required"/> - <xs:attribute name="expression" type="xs:string" /> - <xs:attribute name="async" type="xs:string" default="false" /> - </xs:complexType> - </xs:element> - - <xs:element name="fork"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="script" /> - <xs:group ref="node-content-elements" /> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required"/> - <xs:attribute name="async" type="xs:string" default="false" /> - </xs:complexType> - </xs:element> - - <xs:element name="join"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:group ref="node-content-elements" /> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required"/> - <xs:attribute name="async" type="xs:string" default="false" /> - <xs:attribute name="lock" type="lockMode"/> - </xs:complexType> - </xs:element> - - <xs:element name="node"> - <xs:complexType> - <xs:sequence> - <xs:choice minOccurs="0" maxOccurs="1"> - <xs:group ref="action-elements" /> - </xs:choice> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:group ref="node-content-elements" /> - </xs:choice> - </xs:sequence> - <xs:attribute name="name" type="xs:string" use="required"/> - <xs:attribute name="async" type="xs:string" default="false" /> - </xs:complexType> - </xs:element> - - <xs:element name="process-state"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element name="sub-process"> - <xs:complexType> - <xs:attribute name="name" type="xs:string" - use="required" /> - <xs:attribute name="version" type="xs:integer" /> - <xs:attribute name="binding" type="xs:string" /> - </xs:complexType> - </xs:element> - <xs:element ref="variable" /> - <xs:group ref="node-content-elements" /> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required" /> - <xs:attribute name="async" type="xs:string" default="false" /> - <xs:attribute name="binding" type="bindingType"/> - </xs:complexType> - </xs:element> - - <xs:element name="state"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:group ref="node-content-elements"/> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required"/> - <xs:attribute name="async" type="xs:string" default="false" /> - </xs:complexType> - </xs:element> - - <xs:element name="super-state"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:group ref="node-elements"/> - <xs:group ref="node-content-elements"/> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required"/> - <xs:attribute name="async" type="xs:string" default="false" /> - </xs:complexType> - </xs:element> - - <xs:element name="task-node"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="task" /> - <xs:group ref="node-content-elements" /> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required"/> - <xs:attribute name="create-tasks" type="booleanType" default="true" /> - <xs:attribute name="end-tasks" type="booleanType" default="false" /> - <xs:attribute name="signal" default="last"> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="unsynchronized"/> - <xs:enumeration value="never"/> - <xs:enumeration value="first"/> - <xs:enumeration value="first-wait"/> - <xs:enumeration value="last"/> - <xs:enumeration value="last-wait"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="async" type="xs:string" default="false" /> - </xs:complexType> - </xs:element> - - <xs:element name="mail-node"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="subject" /> - <xs:element ref="text" /> - <xs:group ref="node-content-elements"/> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required"/> - <xs:attribute name="async" type="xs:string" default="false" /> - <xs:attribute name="template" type="xs:string"/> - <xs:attribute name="actors" type="xs:string"/> - <xs:attribute name="to" type="xs:string"/> - <xs:attribute name="subject" type="xs:string"/> - <xs:attribute name="text" type="xs:string"/> - </xs:complexType> - </xs:element> - - -  -  - <xs:element name="transition"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="description" /> - <xs:element name="condition"> - <xs:complexType mixed="true"> - <xs:sequence minOccurs="0" maxOccurs="unbounded"> - <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="expression" type="xs:string" /> - </xs:complexType> - </xs:element> - <xs:group ref="action-elements"/> - <xs:element ref="exception-handler" /> - </xs:choice> - <xs:attribute name="to" type="xs:string" use="required" /> - <xs:attribute name="name" type="xs:string" /> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="action"> - <xs:complexType mixed="true"> - <xs:sequence> - <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="class" type="xs:string" /> - <xs:attribute name="config-type" default="field" type="xs:string" /> - <xs:attribute name="name" type="xs:string" /> - <xs:attribute name="ref-name" type="xs:string" /> - <xs:attribute name="accept-propagated-events" type="booleanType" default="true" /> - <xs:attribute name="expression" type="xs:string" /> - <xs:attribute name="async" type="xs:string" /> - </xs:complexType> - </xs:element> - - <xs:element name="cancel-timer"> - <xs:complexType> - <xs:attribute name="name" type="xs:string" use="required" /> - </xs:complexType> - </xs:element> - - <xs:element name="create-timer"> - <xs:complexType> - <xs:choice minOccurs="0"> - <xs:element ref="action"/> - <xs:element ref="script"/> - </xs:choice> - <xs:attribute name="duedate" type="xs:string" use="required" /> - <xs:attribute name="name" type="xs:string" /> - <xs:attribute name="repeat" type="xs:string" /> - <xs:attribute name="transition" type="xs:string" /> - </xs:complexType> - </xs:element> - - <xs:element name="script"> - <xs:complexType mixed="true"> - <xs:sequence> - <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="name" type="xs:string" /> - <xs:attribute name="accept-propagated-events" type="booleanType" default="true" /> - </xs:complexType> - </xs:element> - - <xs:element name="mail"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="subject" /> - <xs:element ref="text" /> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required"/> - <xs:attribute name="async" type="xs:string" default="false" /> - <xs:attribute name="template" type="xs:string"/> - <xs:attribute name="actors" type="xs:string"/> - <xs:attribute name="to" type="xs:string"/> - <xs:attribute name="subject" type="xs:string"/> - <xs:attribute name="text" type="xs:string"/> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="event"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:group ref="action-elements"/> - </xs:choice> - <xs:attribute name="type" use="required"> - <xs:simpleType> - <xs:union> - <xs:simpleType> - <xs:restriction base="xs:string"/> - </xs:simpleType> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="node-enter"/> - <xs:enumeration value="node-leave"/> - <xs:enumeration value="process-start"/> - <xs:enumeration value="process-end"/> - <xs:enumeration value="task-create"/> - <xs:enumeration value="task-assign"/> - <xs:enumeration value="task-start"/> - <xs:enumeration value="task-end"/> - <xs:enumeration value="before-signal"/> - <xs:enumeration value="after-signal"/> - <xs:enumeration value="superstate-enter"/> - <xs:enumeration value="superstate-leave"/> - <xs:enumeration value="timer-create"/> - <xs:enumeration value="subprocess-created"/> - <xs:enumeration value="subprocess-end"/> - </xs:restriction> - </xs:simpleType> - </xs:union> - </xs:simpleType> - </xs:attribute> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="exception-handler"> - <xs:complexType> - <xs:choice minOccurs="1" maxOccurs="unbounded"> - <xs:element ref="action"/> - <xs:element ref="script"/> - </xs:choice> - <xs:attribute name="exception-class" type="xs:string"/> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="task"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="unbounded"> - <xs:element ref="description" /> - <xs:element ref="assignment"/> - <xs:element ref="controller"/> - <xs:element ref="event"/> - <xs:element ref="timer"/> - <xs:element name="reminder"> - <xs:complexType> - <xs:attribute name="duedate" type="xs:string" use="required" /> - <xs:attribute name="repeat" type="xs:string" /> - </xs:complexType> - </xs:element> - </xs:choice> - <xs:attribute name="name" type="xs:string" /> - <xs:attribute name="blocking" type="booleanType" default="false"/> - <xs:attribute name="signalling" type="booleanType" default="true"/> - <xs:attribute name="description" type="xs:string" /> - <xs:attribute name="duedate" type="xs:string" /> - <xs:attribute name="swimlane" type="xs:string" /> - <xs:attribute name="priority" type="priorityType" default="normal" /> - <xs:attribute name="notify" type="booleanType" default="false"/> - </xs:complexType> - </xs:element> - - <xs:element name="controller" type="delegation" /> - - <xs:element name="assignment"> - <xs:complexType> - <xs:complexContent> - <xs:extension base="delegation"> - <xs:attribute name="expression" type="xs:string" /> - <xs:attribute name="actor-id" type="xs:string" /> - <xs:attribute name="pooled-actors" type="xs:string" /> - </xs:extension> - </xs:complexContent> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="timer"> - <xs:complexType> - <xs:choice minOccurs="0" maxOccurs="1"> - <xs:group ref="action-elements" /> - </xs:choice> - <xs:attribute name="duedate" type="xs:string" use="required" /> - <xs:attribute name="name" type="xs:string" /> - <xs:attribute name="repeat" type="xs:string" /> - <xs:attribute name="transition" type="xs:string" /> - </xs:complexType> - </xs:element> - - <xs:element name="variable"> - <xs:complexType> - <xs:sequence> - <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="name" type="xs:string" use="required"/> - <xs:attribute name="access" type="xs:string" default="read,write"/> - <xs:attribute name="mapped-name" type="xs:string" /> - </xs:complexType> - </xs:element> - -  -  - <xs:element name="to" type="xs:string"/> - <xs:element name="recipients" type="xs:string"/> - <xs:element name="subject" type="xs:string"/> - <xs:element name="text" type="xs:string"/> - <xs:element name="template" type="xs:string"/> - -  -  - - <xs:element name="description" type="xs:string" /> - - <xs:complexType name="delegation" mixed="true"> - <xs:sequence> - <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded" /> - </xs:sequence> - <xs:attribute name="class" type="xs:string" /> - <xs:attribute name="config-type" default="field" type="xs:string" /> - </xs:complexType> - - <xs:simpleType name="configType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="field"/> - <xs:enumeration value="bean"/> - <xs:enumeration value="constructor"/> - <xs:enumeration value="configuration-property"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="booleanType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="yes"/> - <xs:enumeration value="no"/> - <xs:enumeration value="true"/> - <xs:enumeration value="false"/> - <xs:enumeration value="on"/> - <xs:enumeration value="off"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="priorityType"> - <xs:union> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:enumeration value="highest"/> - <xs:enumeration value="high"/> - <xs:enumeration value="normal"/> - <xs:enumeration value="low"/> - <xs:enumeration value="lowest"/> - </xs:restriction> - </xs:simpleType> - <xs:simpleType> - <xs:restriction base="xs:int"/> - </xs:simpleType> - </xs:union> - </xs:simpleType> - - <xs:group name="node-elements"> - <xs:choice> - <xs:element ref="node"/> - <xs:element ref="state"/> - <xs:element ref="task-node"/> - <xs:element ref="super-state"/> - <xs:element ref="process-state"/> - <xs:element ref="fork"/> - <xs:element ref="join"/> - <xs:element ref="decision"/> - <xs:element ref="end-state"/> - <xs:element ref="mail-node"/> - </xs:choice> - </xs:group> - - <xs:group name="action-elements"> - <xs:choice> - <xs:element ref="action"/> - <xs:element ref="script"/> - <xs:element ref="create-timer"/> - <xs:element ref="cancel-timer"/> - <xs:element ref="mail"/> - </xs:choice> - </xs:group> - - <xs:group name="node-content-elements"> - <xs:choice> - <xs:element ref="description" /> - <xs:element ref="event"/> - <xs:element ref="exception-handler"/> - <xs:element ref="timer"/> - <xs:element ref="transition"/> - </xs:choice> - </xs:group> - - <xs:simpleType name="bindingType"> - <xs:restriction base="xs:string"> - <xs:enumeration value="late"/> - <xs:enumeration value="early"/> - </xs:restriction> - </xs:simpleType> - - <xs:simpleType name="lockMode"> - <xs:restriction base="xs:string"> - <xs:enumeration value="NONE"/> - <xs:enumeration value="READ"/> - <xs:enumeration value="UPGRADE"/> - <xs:enumeration value="UPGRADE_NOWAIT"/> - <xs:enumeration value="FORCE"/> - <xs:enumeration value="pessimistic"/> - </xs:restriction> - </xs:simpleType> -</xs:schema> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -48,12 +48,12 @@ <property name="date" column="DATE_" /> <many-to-one name="token" column="TOKEN_" - class="org.jbpm.graph.exe.Token" - foreign-key="FK_LOG_TOKEN" /> + foreign-key="FK_LOG_TOKEN" + index="IDX_LOG_TOKEN" /> <many-to-one name="parent" column="PARENT_" - class="org.jbpm.logging.log.CompositeLog" - foreign-key="FK_LOG_PARENT" /> + foreign-key="FK_LOG_PARENT" + index="IDX_LOG_PARENT" /> </class> </hibernate-mapping> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/scheduler/def/CreateTimerAction.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/scheduler/def/CreateTimerAction.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/scheduler/def/CreateTimerAction.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -18,7 +18,8 @@ <many-to-one name="timerAction" column="TIMERACTION_" foreign-key="FK_CRTETIMERACT_TA" - cascade="all" /> + cascade="all" + index="IDX_CRTETIMERACT_TA" /> </subclass> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Swimlane.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Swimlane.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Swimlane.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -17,10 +17,12 @@ <many-to-one name="assignmentDelegation" column="ASSIGNMENTDELEGATION_" foreign-key="FK_SWL_ASSDEL" - cascade="all" /> + cascade="all" + index="IDX_SWL_ASSDEL" /> <many-to-one name="taskMgmtDefinition" column="TASKMGMTDEFINITION_" - foreign-key="FK_SWL_TSKMGMTDEF"/> + foreign-key="FK_SWL_TSKMGMTDEF" + index="IDX_SWL_TSKMGMTDEF" /> <set name="tasks" cascade="all" inverse="true"> <key column="SWIMLANE_" /> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -48,18 +48,22 @@ index="IDX_TASK_TSKNODE"/> <many-to-one name="startState" column="STARTSTATE_" - foreign-key="FK_TASK_STARTST"/> + foreign-key="FK_TASK_STARTST" + index="IDX_TASK_STARTST"/> <many-to-one name="assignmentDelegation" column="ASSIGNMENTDELEGATION_" foreign-key="FK_TASK_ASSDEL" - cascade="all" /> + cascade="all" + index="IDX_TASK_ASSDEL" /> <many-to-one name="swimlane" column="SWIMLANE_" - foreign-key="FK_TASK_SWIMLANE"/> + foreign-key="FK_TASK_SWIMLANE" + index="IDX_TASK_SWIMLANE"/> <many-to-one name="taskController" column="TASKCONTROLLER_" foreign-key="FK_TSK_TSKCTRL" - cascade="all" /> + cascade="all" + index="IDX_TSK_TSKCTRL" /> </class> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskController.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskController.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskController.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -13,7 +13,8 @@ <many-to-one name="taskControllerDelegation" column="TASKCONTROLLERDELEGATION_" foreign-key="FK_TSKCTRL_DELEG" - cascade="all" /> + cascade="all" + index="IDX_TSKCTRL_DELEG" /> <list name="variableAccesses" cascade="all"> <key column="TASKCONTROLLER_" foreign-key="FK_VARACC_TSKCTRL" /> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -22,7 +22,8 @@ <many-to-one name="startTask" column="STARTTASK_" foreign-key="FK_TSKDEF_START" - cascade="all" /> + cascade="all" + index="IDX_TSKDEF_START" /> </subclass> Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -19,7 +19,8 @@ index="IDX_SWIMLINST_SL"/> <many-to-one name="taskMgmtInstance" column="TASKMGMTINSTANCE_" - foreign-key="FK_SWIMLANEINST_TM"/> + foreign-key="FK_SWIMLANEINST_TM" + index="IDX_SWIMLANEINST_TM"/> <set name="pooledActors" inverse="true" Modified: jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml =================================================================== --- jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -11,7 +11,8 @@ discriminator-value="T"> <many-to-one name="taskMgmtDefinition" column="TASKMGMTDEFINITION_" - foreign-key="FK_TASKMGTINST_TMD"/> + foreign-key="FK_TASKMGTINST_TMD" + index="IDX_TASKMGTINST_TMD"/> <map name="swimlaneInstances" cascade="all" inverse="true">  <appender name="FILE" class="org.apache.log4j.FileAppender"> - <param name="File" value="${log4j.output.dir}/test.log"/> - <param name="Append" value="false"/> + <param name="File" value="${log4j.output.dir}/test.log" /> + <param name="Append" value="false" /> <layout class="org.apache.log4j.PatternLayout">  - <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p (%t) [%c] %m%n" /> </layout> </appender> - +    @@ -24,7 +24,7 @@ <param name="Target" value="System.out" /> <param name="Threshold" value="INFO" /> <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" /> + <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n" /> </layout> </appender> @@ -42,7 +42,7 @@ </category> --> -  +  <category name="org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog"> <priority value="ERROR" /> </category> @@ -65,7 +65,7 @@ <root>  - <appender-ref ref="FILE"/> + <appender-ref ref="FILE" /> </root> </log4j:configuration> Copied: jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094 (from rev 4371, jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094) Deleted: jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml 2009-04-01 02:02:46 UTC (rev 4371) +++ jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<root-container name="processDefinition1" width="806" height="809"> - <node name="start" x="181" y="26" width="132" height="36"> - <edge> - <label x="5" y="-10"/> - </edge> - </node> - <node name="Receive Order" x="350" y="26" width="132" height="36"> - <edge> - <label x="5" y="-10"/> - </edge> - </node> - <node name="Validate Order" x="350" y="89" width="132" height="36"> - <edge> - <label x="5" y="-10"/> - </edge> - </node> - <node name="fork1" x="117" y="224" width="252" height="24"> - <edge> - <label x="-65" y="-8"/> - </edge> - <edge> - <label x="-107" y="-14"/> - </edge> - <edge> - <label x="21" y="-11"/> - </edge> - </node> - <node name="Los Angeles WHSE" x="178" y="298" width="132" height="36"> - <edge> - <label x="5" y="-10"/> - </edge> - </node> - <node name="Dallas WHSE" x="22" y="300" width="132" height="36"> - <edge> - <label x="5" y="-10"/> - </edge> - </node> - <node name="Atlanta WHSE" x="325" y="295" width="132" height="36"> - <edge> - <label x="5" y="-10"/> - </edge> - </node> - <node name="join1" x="118" y="386" width="252" height="24"> - <edge> - <label x="5" y="-10"/> - </edge> - </node> - <node name="Shipment Notice" x="177" y="442" width="132" height="36"> - <edge> - <label x="5" y="-10"/> - </edge> - </node> - <node name="end1" x="176" y="511" width="132" height="36"/> - <node name="Credit Check" x="178" y="88" width="132" height="36"> - <edge> - <label x="5" y="-10"/> - </edge> - </node> - <node name="Inventory Check" x="177" y="154" width="132" height="36"> - <edge> - <label x="5" y="-10"/> - </edge> - </node> -</root-container> Copied: jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml (from rev 4371, jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml) =================================================================== --- jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml (rev 0) +++ jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/gpd.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<root-container name="processDefinition1" width="806" height="809"> + <node name="start" x="181" y="26" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="Receive Order" x="350" y="26" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="Validate Order" x="350" y="89" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="fork1" x="117" y="224" width="252" height="24"> + <edge> + <label x="-65" y="-8"/> + </edge> + <edge> + <label x="-107" y="-14"/> + </edge> + <edge> + <label x="21" y="-11"/> + </edge> + </node> + <node name="Los Angeles WHSE" x="178" y="298" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="Dallas WHSE" x="22" y="300" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="Atlanta WHSE" x="325" y="295" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="join1" x="118" y="386" width="252" height="24"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="Shipment Notice" x="177" y="442" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="end1" x="176" y="511" width="132" height="36"/> + <node name="Credit Check" x="178" y="88" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> + <node name="Inventory Check" x="177" y="154" width="132" height="36"> + <edge> + <label x="5" y="-10"/> + </edge> + </node> +</root-container> Deleted: jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml 2009-04-01 02:02:46 UTC (rev 4371) +++ jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -1,137 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<process-definition xmlns="urn:jbpm.org:jpdl-3.1" name="processDefinition1"> - - <start-state name="start"> - <transition name="" to="Receive Order"/> - </start-state> - - <node async="true" name="Receive Order"> - <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> - <esbCategoryName>BPM_Orchestration2_Service1</esbCategoryName> - <esbServiceName>Service1</esbServiceName> - <bpmToEsbVars> - <mapping bpm="theBody" esb="BODY_CONTENT" /> - </bpmToEsbVars> - <esbToBpmVars> - <mapping bpm="theBody" esb="BODY_CONTENT" /> - </esbToBpmVars> - </action> - <transition to="Validate Order"/> - </node> - - <node async="true" name="Validate Order"> - <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> - <esbCategoryName>BPM_Orchestration2_Service2</esbCategoryName> - <esbServiceName>Service2</esbServiceName> - <bpmToEsbVars> - <mapping bpm="theBody" esb="BODY_CONTENT" /> - </bpmToEsbVars> - <esbToBpmVars> - <mapping bpm="theBody" esb="BODY_CONTENT" /> - </esbToBpmVars> - </action> - <transition to="Credit Check"/> - </node> - - <fork name="fork1"> - <transition to="Los Angeles WHSE" name="to Los Angeles WHSE"/> - <transition to="Dallas WHSE" name="to Dallas WHSE"/> - <transition name="to Atlanta WHSE" to="Atlanta WHSE"/> - </fork> - - <node async="true" name="Los Angeles WHSE"> - <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> - <esbCategoryName>BPM_Orchestration2_Service5</esbCategoryName> - <esbServiceName>Service5</esbServiceName> - <bpmToEsbVars> - <mapping bpm="theBody" esb="BODY_CONTENT" /> - </bpmToEsbVars> - <esbToBpmVars> - <mapping bpm="la" esb="BODY_CONTENT" /> - </esbToBpmVars> - </action> - <transition name="" to="join1"/> - </node> - - <node async="true" name="Dallas WHSE"> - <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> - <esbCategoryName>BPM_Orchestration2_Service6</esbCategoryName> - <esbServiceName>Service6</esbServiceName> - <bpmToEsbVars> - <mapping bpm="theBody" esb="BODY_CONTENT" /> - </bpmToEsbVars> - <esbToBpmVars> - <mapping bpm="dallas" esb="BODY_CONTENT" /> - </esbToBpmVars> - </action> - <transition name="" to="join1"/> - </node> - - <node async="true" name="Atlanta WHSE"> - - <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> - <esbCategoryName>BPM_Orchestration2_Service7</esbCategoryName> - <esbServiceName>Service7</esbServiceName> - <bpmToEsbVars> - <mapping bpm="theBody" esb="BODY_CONTENT" /> - </bpmToEsbVars> - <esbToBpmVars> - <mapping bpm="atlanta" esb="BODY_CONTENT" /> - </esbToBpmVars> - </action> - <transition name="" to="join1"/> - </node> - - <join name="join1"> - <transition to="Shipment Notice"/> - </join> - - <node async="true" name="Shipment Notice"> - <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> - <esbCategoryName>BPM_Orchestration2_ResultsService - </esbCategoryName> - <esbServiceName>ResultsService</esbServiceName> - <bpmToEsbVars> - <mapping bpm="atlanta" esb="atlanta" /> - <mapping bpm="la" esb="la" /> - <mapping bpm="dallas" esb="dallas" /> - </bpmToEsbVars> - <esbToBpmVars> - <mapping bpm="theBody" esb="BODY_CONTENT" /> - </esbToBpmVars> - </action> - <transition name="" to="end1"/> - </node> - - <end-state name="end1"/> - - <node async="true" name="Credit Check"> - <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> - <esbCategoryName>BPM_Orchestration2_Service3</esbCategoryName> - <esbServiceName>Service3</esbServiceName> - <bpmToEsbVars> - <mapping bpm="theBody" esb="BODY_CONTENT" /> - </bpmToEsbVars> - <esbToBpmVars> - <mapping bpm="theBody" esb="BODY_CONTENT" /> - </esbToBpmVars> - </action> - <transition to="Inventory Check"/> - </node> - - <node async="true" name="Inventory Check"> - <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> - <esbCategoryName>BPM_Orchestration2_Service4</esbCategoryName> - <esbServiceName>Service4</esbServiceName> - <bpmToEsbVars> - <mapping bpm="theBody" esb="BODY_CONTENT" /> - </bpmToEsbVars> - <esbToBpmVars> - <mapping bpm="theBody" esb="BODY_CONTENT" /> - </esbToBpmVars> - </action> - <transition to="fork1"/> - </node> - -</process-definition> Copied: jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml (from rev 4371, jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml) =================================================================== --- jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml (rev 0) +++ jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jbpm2094/processdefinition.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<process-definition xmlns="urn:jbpm.org:jpdl-3.1" name="processDefinition1"> + + <start-state name="start"> + <transition name="" to="Receive Order"/> + </start-state> + + <node async="true" name="Receive Order"> + <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> + <esbCategoryName>BPM_Orchestration2_Service1</esbCategoryName> + <esbServiceName>Service1</esbServiceName> + <bpmToEsbVars> + <mapping bpm="theBody" esb="BODY_CONTENT" /> + </bpmToEsbVars> + <esbToBpmVars> + <mapping bpm="theBody" esb="BODY_CONTENT" /> + </esbToBpmVars> + </action> + <transition to="Validate Order"/> + </node> + + <node async="true" name="Validate Order"> + <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> + <esbCategoryName>BPM_Orchestration2_Service2</esbCategoryName> + <esbServiceName>Service2</esbServiceName> + <bpmToEsbVars> + <mapping bpm="theBody" esb="BODY_CONTENT" /> + </bpmToEsbVars> + <esbToBpmVars> + <mapping bpm="theBody" esb="BODY_CONTENT" /> + </esbToBpmVars> + </action> + <transition to="Credit Check"/> + </node> + + <fork name="fork1"> + <transition to="Los Angeles WHSE" name="to Los Angeles WHSE"/> + <transition to="Dallas WHSE" name="to Dallas WHSE"/> + <transition name="to Atlanta WHSE" to="Atlanta WHSE"/> + </fork> + + <node async="true" name="Los Angeles WHSE"> + <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> + <esbCategoryName>BPM_Orchestration2_Service5</esbCategoryName> + <esbServiceName>Service5</esbServiceName> + <bpmToEsbVars> + <mapping bpm="theBody" esb="BODY_CONTENT" /> + </bpmToEsbVars> + <esbToBpmVars> + <mapping bpm="la" esb="BODY_CONTENT" /> + </esbToBpmVars> + </action> + <transition name="" to="join1"/> + </node> + + <node async="true" name="Dallas WHSE"> + <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> + <esbCategoryName>BPM_Orchestration2_Service6</esbCategoryName> + <esbServiceName>Service6</esbServiceName> + <bpmToEsbVars> + <mapping bpm="theBody" esb="BODY_CONTENT" /> + </bpmToEsbVars> + <esbToBpmVars> + <mapping bpm="dallas" esb="BODY_CONTENT" /> + </esbToBpmVars> + </action> + <transition name="" to="join1"/> + </node> + + <node async="true" name="Atlanta WHSE"> + + <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> + <esbCategoryName>BPM_Orchestration2_Service7</esbCategoryName> + <esbServiceName>Service7</esbServiceName> + <bpmToEsbVars> + <mapping bpm="theBody" esb="BODY_CONTENT" /> + </bpmToEsbVars> + <esbToBpmVars> + <mapping bpm="atlanta" esb="BODY_CONTENT" /> + </esbToBpmVars> + </action> + <transition name="" to="join1"/> + </node> + + <join name="join1"> + <transition to="Shipment Notice"/> + </join> + + <node async="true" name="Shipment Notice"> + <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> + <esbCategoryName>BPM_Orchestration2_ResultsService + </esbCategoryName> + <esbServiceName>ResultsService</esbServiceName> + <bpmToEsbVars> + <mapping bpm="atlanta" esb="atlanta" /> + <mapping bpm="la" esb="la" /> + <mapping bpm="dallas" esb="dallas" /> + </bpmToEsbVars> + <esbToBpmVars> + <mapping bpm="theBody" esb="BODY_CONTENT" /> + </esbToBpmVars> + </action> + <transition name="" to="end1"/> + </node> + + <end-state name="end1"/> + + <node async="true" name="Credit Check"> + <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> + <esbCategoryName>BPM_Orchestration2_Service3</esbCategoryName> + <esbServiceName>Service3</esbServiceName> + <bpmToEsbVars> + <mapping bpm="theBody" esb="BODY_CONTENT" /> + </bpmToEsbVars> + <esbToBpmVars> + <mapping bpm="theBody" esb="BODY_CONTENT" /> + </esbToBpmVars> + </action> + <transition to="Inventory Check"/> + </node> + + <node async="true" name="Inventory Check"> + <action name="esbAction" class="org.jbpm.jbpm2094.EsbActionHandler"> + <esbCategoryName>BPM_Orchestration2_Service4</esbCategoryName> + <esbServiceName>Service4</esbServiceName> + <bpmToEsbVars> + <mapping bpm="theBody" esb="BODY_CONTENT" /> + </bpmToEsbVars> + <esbToBpmVars> + <mapping bpm="theBody" esb="BODY_CONTENT" /> + </esbToBpmVars> + </action> + <transition to="fork1"/> + </node> + +</process-definition> Modified: jbpm3/trunk/modules/db/pom.xml =================================================================== --- jbpm3/trunk/modules/db/pom.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/db/pom.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -70,10 +70,17 @@ <scope>runtime</scope> </dependency> <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> - <scope>runtime</scope> + <groupId>com.sybase</groupId> + <artifactId>jconnect</artifactId> + <version>${jconnect.version}</version> + <scope>runtime</scope> </dependency> + <dependency> + <groupId>com.oracle</groupId> + <artifactId>ojdbc14</artifactId> + <version>${ojdbc.version}</version> + <scope>runtime</scope> + </dependency> </dependencies>  Modified: jbpm3/trunk/modules/db/scripts/antrun-jbpmschema.xml =================================================================== --- jbpm3/trunk/modules/db/scripts/antrun-jbpmschema.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/db/scripts/antrun-jbpmschema.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -49,7 +49,8 @@ <jbpmschema output="${scriptsdir}/jbpm.jpdl.mysql.update322.sql" config="hibernate.cfg.mysql.xml" properties="mysql.properties" action="update" delimiter=";"/> <jbpmschema output="${scriptsdir}/jbpm.jpdl.postgresql.update322.sql" config="hibernate.cfg.postgresql.xml" properties="postgresql.properties" action="update" delimiter=";"/> - <jbpmschema output="${scriptsdir}/jbpm.jpdl.sybase.update322.sql" config="hibernate.cfg.sybase.xml" properties="sybase.properties" action="update" delimiter=";"/> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.sybase.update322.sql" config="hibernate.cfg.sybase.xml" properties="sybase.properties" action="update" /> + <jbpmschema output="${scriptsdir}/jbpm.jpdl.oracle.update322.sql" config="hibernate.cfg.oracle.xml" properties="oracle.properties" action="update" delimiter=";"/> </target> Copied: jbpm3/trunk/modules/db/src/main/resources/oracle.properties (from rev 4371, jbpm3/branches/jbpm-3.2.5.SP/modules/db/src/main/resources/oracle.properties) =================================================================== --- jbpm3/trunk/modules/db/src/main/resources/oracle.properties (rev 0) +++ jbpm3/trunk/modules/db/src/main/resources/oracle.properties 2009-04-02 22:50:29 UTC (rev 4398) @@ -0,0 +1,8 @@ +hibernate.dialect=org.hibernate.dialect.Oracle10gDialect +# +# This uses the jbpm322 database schema as reference for the SchemaUpdate task +# +hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver +hibernate.connection.url=jdbc:oracle:thin:@${jdbc.oracle.server}:${jdbc.oracle.port}:jbpm322 +hibernate.connection.username=${jdbc.oracle.username} +hibernate.connection.password=${jdbc.oracle.password} Modified: jbpm3/trunk/modules/db/src/main/resources/postgresql.properties =================================================================== --- jbpm3/trunk/modules/db/src/main/resources/postgresql.properties 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/db/src/main/resources/postgresql.properties 2009-04-02 22:50:29 UTC (rev 4398) @@ -3,6 +3,6 @@ # This uses the jbpm322 database schema as reference for the SchemaUpdate task # hibernate.connection.driver_class=org.postgresql.Driver -hibernate.connection.url=jdbc\:postgresql\://${jdbc.postgresql.server}\:${jdbc.postgresql.port}/jbpm322 +hibernate.connection.url=jdbc:postgresql://${jdbc.postgresql.server}:${jdbc.postgresql.port}/jbpm322 hibernate.connection.username=${jdbc.postgresql.username} hibernate.connection.password=${jdbc.postgresql.password} Modified: jbpm3/trunk/modules/db/src/main/resources/sybase.properties =================================================================== --- jbpm3/trunk/modules/db/src/main/resources/sybase.properties 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/db/src/main/resources/sybase.properties 2009-04-02 22:50:29 UTC (rev 4398) @@ -2,7 +2,7 @@ # # This uses the jbpm322 database schema as reference for the SchemaUpdate task # -hibernate.connection.driver_class=net.sourceforge.jtds.jdbc.Driver -hibernate.connection.url=jdbc:jtds:sybase://${jdbc.sybase.server}:${jdbc.sybase.port}/jbpm322 +hibernate.connection.driver_class=${jdbc.sybase.driver} +hibernate.connection.url=jdbc:sybase:Tds:${jdbc.sybase.server}:${jdbc.sybase.port}/jbpm322 hibernate.connection.username=${jdbc.sybase.username} hibernate.connection.password=${jdbc.sybase.password} Modified: jbpm3/trunk/modules/distribution/pom.xml =================================================================== --- jbpm3/trunk/modules/distribution/pom.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/distribution/pom.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -171,10 +171,6 @@ <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> </dependency> - <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> - </dependency> </dependencies>  Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -88,6 +88,12 @@ <macro-enable file="${sybase.cfg.xml}" section="DataSource properties"/> <macro-enable file="${sybase.cfg.xml}" section="JTA transaction properties"/> + <property name="oracle.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.oracle.xml"/> + <macro-disable file="${oracle.cfg.xml}" section="JDBC connection properties"/> + <macro-disable file="${oracle.cfg.xml}" section="Automatic schema creation"/> + <macro-enable file="${oracle.cfg.xml}" section="DataSource properties"/> + <macro-enable file="${oracle.cfg.xml}" section="JTA transaction properties"/> + <condition property="database.is.hsqldb" value="true" else="false"> <equals arg1="${database}" arg2="hsqldb"/> </condition> @@ -100,6 +106,9 @@ <condition property="database.is.sybase" value="true" else="false"> <equals arg1="${database}" arg2="sybase"/> </condition> + <condition property="database.is.oracle" value="true" else="false"> + <equals arg1="${database}" arg2="oracle"/> + </condition> </target> @@ -116,6 +125,7 @@ <filter token="database.is.mysql" value="${database.is.mysql}" /> <filter token="database.is.postgresql" value="${database.is.postgresql}" /> <filter token="database.is.sybase" value="${database.is.sybase}" /> + <filter token="database.is.oracle" value="${database.is.oracle}" /> <filter token="jbpm.target.container" value="${jbpm.target.container}" /> <filter token="jboss.home" value="${jboss.home}" /> <filter token="product.version" value="${product.version}" /> Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -83,6 +83,10 @@ <name>dbSelection</name> <value>sybase</value> </condition> + <condition type="variable" id="isOracle"> + <name>dbSelection</name> + <value>oracle</value> + </condition> </conditions>  @@ -220,13 +224,15 @@ <include name="hibernate.cfg.mysql.xml"/> <include name="hibernate.cfg.postgresql.xml"/> <include name="hibernate.cfg.sybase.xml"/> + <include name="hibernate.cfg.oracle.xml"/> <include name="jbpm-hsqldb-ds.xml"/> <include name="jbpm-mysql-ds.xml"/> <include name="jbpm-postgresql-ds.xml"/> <include name="jbpm-sybase-ds.xml"/> + <include name="jbpm-oracle-ds.xml"/> </fileset> -  +  <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/> <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> @@ -254,9 +260,11 @@ <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-sybase-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isSybase"/> <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.sybase.xml" condition="isSybase" target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> - <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isSybase"> - <include name="jtds.jar" /> - </fileset> + +  + <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-oracle-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isOracle"/> + <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.oracle.xml" condition="isOracle" + target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" /> </pack>  -  -  -  -  -  -  -  + + + + + + + + -  + + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -30,7 +31,7 @@ <properties> <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args> </properties> - +  <dependencies>  @@ -210,7 +211,7 @@ </plugins> </build> </profile> - +  + <profile> + <id>oracle</id> + <activation> + <property> + <name>database</name> + <value>oracle</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + </plugins> + </build> + <dependencies> + </dependencies> + </profile> + </profiles> </project> Modified: jbpm3/trunk/modules/userguide/pom.xml =================================================================== --- jbpm3/trunk/modules/userguide/pom.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/modules/userguide/pom.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -41,6 +41,7 @@ <plugin> <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> + <version>${jdocbook.version}</version> <extensions>true</extensions> <configuration> <sourceDocumentName>en/master.xml</sourceDocumentName> Modified: jbpm3/trunk/pom.xml =================================================================== --- jbpm3/trunk/pom.xml 2009-04-02 21:06:11 UTC (rev 4397) +++ jbpm3/trunk/pom.xml 2009-04-02 22:50:29 UTC (rev 4398) @@ -1,22 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -  -  -  -  -  -  -  -  + + + + + + + + -  -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss jBPM3</name> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm</artifactId> <packaging>pom</packaging> - <version>3.2.7-SNAPSHOT</version> <url>http://www.jboss.org/jbossjbpm/</url> @@ -35,7 +36,7 @@ <module>modules/examples</module> <module>modules/simulation</module> -  @@ -77,6 +78,7 @@ <jboss.client.version>4.2.2.GA</jboss.client.version> <jboss.gravel.version>1.0.0.GA</jboss.gravel.version> <jboss.seam.version>2.0.2.GA</jboss.seam.version> + <jdocbook.version>2.1.2</jdocbook.version> <junit.version>3.8.1</junit.version> <oscache.version>2.4</oscache.version> <poi.version>3.0.2-FINAL</poi.version> @@ -91,7 +93,7 @@ <postgresql.version>8.3-603.jdbc3</postgresql.version> <jtds.version>1.2.2</jtds.version> <jconnect.version>6.0.5</jconnect.version> - <ojdbc.version>10.0.2.0</ojdbc.version> + <ojdbc.version>10.2.0.4</ojdbc.version> </properties>  @@ -127,7 +129,7 @@  <dependency> <groupId>org.jboss.bpm</groupId> - <artifactId>bpm-spec-api</artifactId> + <artifactId>bpm-spec-api</artifactId> <version>${bpm.spec.version}</version> </dependency> @@ -391,11 +393,6 @@ <artifactId>postgresql</artifactId> <version>${postgresql.version}</version> </dependency> - <dependency> - <groupId>net.sourceforge.jtds</groupId> - <artifactId>jtds</artifactId> - <version>${jtds.version}</version> - </dependency> </dependencies> </dependencyManagement> @@ -430,6 +427,15 @@  <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>${jdocbook.version}</version> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <artifactId>maven-surefire-plugin</artifactId> @@ -467,7 +473,7 @@ <plugin> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <quite>true</quite> + <quiet>true</quiet> </configuration> <executions> <execution>

17 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4397 - in jbpm4/trunk/modules: examples/scripts and 24 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-02 17:06:11 -0400 (Thu, 02 Apr 2009) New Revision: 4397 Added: jbpm4/trunk/modules/integration/jboss5/src/main/resources/deployers.xml Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java jbpm4/trunk/modules/integration/jboss5/pom.xml jbpm4/trunk/modules/integration/jboss5/scripts/assembly-config.xml jbpm4/trunk/modules/integration/jboss5/src/main/resources/META-INF/jbpm-deployers-jboss-beans.xml Log: Fix JBPM-2141: Use same deployment archive suffixes across target containers Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-04-02 21:06:11 UTC (rev 4397) @@ -247,7 +247,7 @@ </fileset>  @@ -273,6 +273,13 @@ <include name="jbpm-service-jboss-beans.xml"/> </fileset> +  + <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jboss5-config" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/conf/bootstrap" + override="true" + condition="isJBoss500"> + <include name="deployers.xml"/> + </fileset>  - - <condition property="archive.suffix" value="jar" else="jpdl"> - <equals arg1="${jbpm.target.container}" arg2="jboss500"/> - </condition> - <target name="build-jars" description="Build the test modules."> - <echo>FIXME JBPM-2141: Deployment suffix ${archive.suffix} ***</echo> - <mkdir dir="${build.dir}/test-libs"/>  @@ -96,7 +84,7 @@ <attribute name="pkg"/> <sequential> - <jar destfile="${build.dir}/test-libs/jbpm-(a){name}.${archive.suffix}"> + <jar destfile="${build.dir}/test-libs/jbpm-(a){name}.jpdl"> <fileset dir="${build.dir}/test-classes"> <include name="org/jbpm/examples/@{pkg}/**/*" /> <exclude name="**/process.jpdl.xml"/> Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/concurrency/graphbased/ConcurrencyGraphBasedTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -37,14 +37,14 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-ConcurrencyGraphBasedTest.jar"); + deploy("jbpm-ConcurrencyGraphBasedTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-ConcurrencyGraphBasedTest.jar"); + undeploy("jbpm-ConcurrencyGraphBasedTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/multiple/EndMultipleTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -33,13 +33,13 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-EndMultipleTest.jar"); + deploy("jbpm-EndMultipleTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-EndMultipleTest.jar"); + undeploy("jbpm-EndMultipleTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/processinstance/EndProcessInstanceTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -33,12 +33,12 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-EndProcessInstanceTest.jar"); + deploy("jbpm-EndProcessInstanceTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-EndProcessInstanceTest.jar"); + undeploy("jbpm-EndProcessInstanceTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/end/state/EndStateTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -34,13 +34,13 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-EndStateTest.jar"); + deploy("jbpm-EndStateTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-EndStateTest.jar"); + undeploy("jbpm-EndStateTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -50,12 +50,12 @@ courier = new JbpmMockCourier(); MockRegistry.register("orderProcessing", "bookSold", epr, courier); - deploy("jbpm-EsbTest.jar"); + deploy("jbpm-EsbTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-EsbTest.jar"); + undeploy("jbpm-EsbTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/conditions/ExclusiveConditionsTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -36,13 +36,13 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-ExclusiveConditionsTest.jar"); + deploy("jbpm-ExclusiveConditionsTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-ExclusiveConditionsTest.jar"); + undeploy("jbpm-ExclusiveConditionsTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/expression/ExclusiveExpressionTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -36,13 +36,13 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-ExclusiveExpressionTest.jar"); + deploy("jbpm-ExclusiveExpressionTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-ExclusiveExpressionTest.jar"); + undeploy("jbpm-ExclusiveExpressionTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/exclusive/handler/ExclusiveHandlerTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -36,12 +36,12 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-ExclusiveHandlerTest.jar"); + deploy("jbpm-ExclusiveHandlerTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-ExclusiveHandlerTest.jar"); + undeploy("jbpm-ExclusiveHandlerTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/hql/HqlTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -39,12 +39,12 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-HqlTest.jar"); + deploy("jbpm-HqlTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-HqlTest.jar"); + undeploy("jbpm-HqlTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/java/JavaInstantiateTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -33,12 +33,12 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-JavaInstantiateTest.jar"); + deploy("jbpm-JavaInstantiateTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-JavaInstantiateTest.jar"); + undeploy("jbpm-JavaInstantiateTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -37,13 +37,13 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-ScriptExpressionTest.jar"); + deploy("jbpm-ScriptExpressionTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-ScriptExpressionTest.jar"); + undeploy("jbpm-ScriptExpressionTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/ScriptTextTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -36,12 +36,12 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-ScriptTextTest.jar"); + deploy("jbpm-ScriptTextTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-ScriptTextTest.jar"); + undeploy("jbpm-ScriptTextTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/sql/SqlTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -39,12 +39,12 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-SqlTest.jar"); + deploy("jbpm-SqlTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-SqlTest.jar"); + undeploy("jbpm-SqlTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/choice/StateChoiceTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -33,12 +33,12 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-StateChoiceTest.jar"); + deploy("jbpm-StateChoiceTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-StateChoiceTest.jar"); + undeploy("jbpm-StateChoiceTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/state/sequence/StateSequenceTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -33,12 +33,12 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-StateSequenceTest.jar"); + deploy("jbpm-StateSequenceTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-StateSequenceTest.jar"); + undeploy("jbpm-StateSequenceTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignee/TaskAssigneeTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -38,12 +38,12 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-TaskAssigneeTest.jar"); + deploy("jbpm-TaskAssigneeTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-TaskAssigneeTest.jar"); + undeploy("jbpm-TaskAssigneeTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/assignmenthandler/TaskAssignmentHandlerTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -34,12 +34,12 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-TaskAssignmentHandlerTest.jar"); + deploy("jbpm-TaskAssignmentHandlerTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-TaskAssignmentHandlerTest.jar"); + undeploy("jbpm-TaskAssignmentHandlerTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/candidates/TaskCandidatesTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -37,7 +37,7 @@ { super.setUp(); - deploy("jbpm-TaskCandidatesTest.jar"); + deploy("jbpm-TaskCandidatesTest.jpdl"); if(identityService.findGroupById("sales-test-group")==null) { @@ -54,7 +54,7 @@ protected void tearDown() throws Exception { - undeploy("jbpm-TaskCandidatesTest.jar"); + undeploy("jbpm-TaskCandidatesTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/swimlane/TaskSwimlaneTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -35,7 +35,7 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-TaskSwimlaneTest.jar"); + deploy("jbpm-TaskSwimlaneTest.jpdl"); if(identityService.findGroupById("sales-test-group")==null) { @@ -49,7 +49,7 @@ protected void tearDown() throws Exception { - undeploy("jbpm-TaskSwimlaneTest.jar"); + undeploy("jbpm-TaskSwimlaneTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/task/variables/TaskVariablesTest.java 2009-04-02 21:06:11 UTC (rev 4397) @@ -41,12 +41,12 @@ protected void setUp() throws Exception { super.setUp(); - deploy("jbpm-TaskVariablesTest.jar"); + deploy("jbpm-TaskVariablesTest.jpdl"); } protected void tearDown() throws Exception { - undeploy("jbpm-TaskVariablesTest.jar"); + undeploy("jbpm-TaskVariablesTest.jpdl"); super.tearDown(); } Modified: jbpm4/trunk/modules/integration/jboss5/pom.xml =================================================================== --- jbpm4/trunk/modules/integration/jboss5/pom.xml 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/integration/jboss5/pom.xml 2009-04-02 21:06:11 UTC (rev 4397) @@ -60,7 +60,8 @@ <excludes> <exclude>META-INF/jbpm-service-jboss-beans.xml</exclude> <exclude>META-INF/jbpm-deployers-jboss-beans.xml</exclude> - <exclude>META-INF/jbpm.deployer.cfg.xml</exclude> + <exclude>META-INF/jbpm.deployer.cfg.xml</exclude> + <exclude>deployers.xml</exclude> </excludes> </configuration> </plugin> Modified: jbpm4/trunk/modules/integration/jboss5/scripts/assembly-config.xml =================================================================== --- jbpm4/trunk/modules/integration/jboss5/scripts/assembly-config.xml 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/integration/jboss5/scripts/assembly-config.xml 2009-04-02 21:06:11 UTC (rev 4397) @@ -12,6 +12,7 @@ <includes> <include>**/*beans.xml</include> <include>**/jbpm.deployer.cfg.xml</include> + <include>deployers.xml</include> </includes> </fileSet> </fileSets> Modified: jbpm4/trunk/modules/integration/jboss5/src/main/resources/META-INF/jbpm-deployers-jboss-beans.xml =================================================================== --- jbpm4/trunk/modules/integration/jboss5/src/main/resources/META-INF/jbpm-deployers-jboss-beans.xml 2009-04-02 20:21:54 UTC (rev 4396) +++ jbpm4/trunk/modules/integration/jboss5/src/main/resources/META-INF/jbpm-deployers-jboss-beans.xml 2009-04-02 21:06:11 UTC (rev 4397) @@ -28,7 +28,7 @@ <property name="suffix">.jpdl.xml</property>  - <property name="jarExtension">jar</property> + <property name="jarExtension">jpdl</property> <property name="allowMultipleFiles">true</property> Added: jbpm4/trunk/modules/integration/jboss5/src/main/resources/deployers.xml =================================================================== --- jbpm4/trunk/modules/integration/jboss5/src/main/resources/deployers.xml (rev 0) +++ jbpm4/trunk/modules/integration/jboss5/src/main/resources/deployers.xml 2009-04-02 21:06:11 UTC (rev 4397) @@ -0,0 +1,237 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <classloader><inject bean="deployers-classloader:0.0.0"/></classloader> + + <classloader name="deployers-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true"> + <root>${jboss.lib.url}jboss-deployers-core-spi.jar</root> + <root>${jboss.lib.url}jboss-deployers-core.jar</root> + <root>${jboss.lib.url}jboss-deployers-client-spi.jar</root> + <root>${jboss.lib.url}jboss-deployers-client.jar</root> + <root>${jboss.lib.url}jboss-deployers-structure-spi.jar</root> + <root>${jboss.lib.url}jboss-deployers-spi.jar</root> + <root>${jboss.lib.url}jboss-deployers-impl.jar</root> + <root>${jboss.lib.url}jboss-deployers-vfs-spi.jar</root> + <root>${jboss.lib.url}jboss-deployers-vfs.jar</root> + +  + <root>${jboss.lib.url}jaxb-impl.jar</root> +  + <root>${jboss.lib.url}wstx.jar</root> + </classloader> + +  + <bean name="topContextComparator"> + <constructor factoryClass="org.jboss.system.deployers.LegacyDeploymentContextComparator" factoryMethod="getInstance"/> + </bean> + +  + <bean name="ManagedObjectFactory"> + <constructor factoryClass="org.jboss.managed.api.factory.ManagedObjectFactory" factoryMethod="getInstance"/> +  + <incallback method="addInstanceClassFactory"/> + <uncallback method="removeInstanceClassFactory"/> +  + <incallback method="addManagedObjectDefinition"/> + <uncallback method="removeManagedObjectDefinition"/> + </bean> +  + <bean name="ManagedObjectCreator" class="org.jboss.deployers.spi.deployer.helpers.DefaultManagedObjectCreator"> + <property name="mof"><inject bean="ManagedObjectFactory"/></property> + </bean> + +  + <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl"> + <property name="structuralDeployers"><inject bean="StructuralDeployers"/></property> + <property name="deployers"><inject bean="Deployers"/></property> + <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property> + <property name="comparator"><inject bean="topContextComparator"/></property> + </bean> + +  + <bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.TypedManagedDeploymentCreator" /> + +  + <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl"> + <property name="structureBuilder"> +  + <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder"/> + </property> +  + <incallback method="addDeployer"/> + <uncallback method="removeDeployer"/> + </bean> + +  + <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl"> + <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.deployment:service=DeployersImpl", exposedInterface=org.jboss.deployers.plugins.deployers.DeployersImplMBean.class, registerDirectly=true)</annotation> + <constructor><parameter><inject bean="jboss.kernel:service=KernelController"/></parameter></constructor> +  + <incallback method="addDeployer"/> + <uncallback method="removeDeployer"/> + <property name="mgtObjectCreator"><inject bean="ManagedObjectCreator"/></property> + </bean> + +  + <bean name="DeclaredStructure" class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/> + +  + <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure"> +  + <constructor> + <parameter> + <set elementClass="java.lang.String"> + <value>.zip</value> + <value>.ear</value> + <value>.jar</value> + <value>.rar</value> + <value>.war</value> + <value>.sar</value> + <value>.har</value> + <value>.aop</value> + <value>.deployer</value> + <value>.beans</value> + +  + <value>.spring</value> + <value>.rails</value> + <value>.esb</value> + <value>.jpdl</value> + </set> + </parameter> + </constructor> + <property name="candidateStructureVisitorFactory"> +  + <bean name="JARStructureCandidates" class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory"> +  + <property name="filter"> + <bean name="JARFilter" class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter"> + <constructor><parameter> + <list elementClass="java.lang.String"> +  + <value>.class</value> + </list> + </parameter></constructor> + </bean> + </property> + </bean> + </property> + </bean> + +  + <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure"> +  + <constructor> + <parameter> + <set elementClass="java.lang.String"> + <value>-service.xml</value> + <value>-beans.xml</value> + <value>-ds.xml</value> + <value>-aop.xml</value> + </set> + </parameter> + </constructor> + </bean> + +  + + <bean name="AOPXMLMetaDataParserDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer"> + <constructor> + <parameter>org.jboss.aop.microcontainer.beans.metadata.AOPDeployment</parameter> + </constructor> + <property name="suffix">-aop.xml</property> + </bean> + <bean name="AOPAnnotationMetaDataParserDeployer" class="org.jboss.aop.asintegration.jboss5.AOPAnnotationMetaDataParserDeployer"> + <constructor> + <parameter><inject bean="AOPXMLMetaDataParserDeployer" property="relativeOrder"/></parameter> + </constructor> + </bean> + <bean name="AOPClassLoaderDeployer" class="org.jboss.aop.asintegration.jboss5.AOPClassLoaderDeployer"> + <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property> + </bean> + <bean name="AOPDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.AOPDeploymentAopMetaDataDeployer"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property> + </bean> + <bean name="BeansDeploymentAopMetaDataDeployer" class="org.jboss.aop.asintegration.jboss5.BeansDeploymentAopMetaDataDeployer"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + <property name="aspectManager"><inject bean="AspectManager" property="aspectManager"/></property> + </bean> + +  + <bean name="BeanMetaDataICF" class="org.jboss.deployers.plugins.managed.BeanMetaDataICF"> + <property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property> + </bean> + <bean name="KernelDeploymentManagedObjectCreator" class="org.jboss.deployers.plugins.managed.KernelDeploymentManagedObjectCreator"> + <constructor><parameter><inject bean="ManagedObjectFactory"/></parameter></constructor> + </bean> + <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer"> + <property name="suffix">jboss-beans.xml</property> + </bean> + <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"> + <install bean="ManagedDeploymentCreator" method="addAttachmentType"> + <parameter> + <value>org.jboss.kernel.spi.deployment.KernelDeployment</value> + </parameter> + <parameter> + <value>beans</value> + </parameter> + </install> + <uninstall bean="ManagedDeploymentCreator" method="removeAttachmentType"> + <parameter> + <value>org.jboss.kernel.spi.deployment.KernelDeployment</value> + </parameter> + </uninstall> + <property name="mgtObjectCreator"><inject bean="KernelDeploymentManagedObjectCreator"/></property> + </bean> + <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer"> + <constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor> + </bean> + +  + <bean name="ServiceMetaDataICF" class="org.jboss.system.deployers.managed.ServiceMetaDataICF"> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + <bean name="SARDeployer" class="org.jboss.system.deployers.SARDeployer"> + </bean> + <bean name="ServiceClassLoaderDeployer" class="org.jboss.system.deployers.ServiceClassLoaderDeployer"/> + <bean name="ServiceDeploymentDeployer" class="org.jboss.system.deployers.ServiceDeploymentDeployer"> + </bean> + <bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer"> + <constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor> + </bean> + + <bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer"> + <constructor> + <parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter> + </constructor> + <property name="name">jboss-classloading.xml</property> + <property name="buildManagedObject">true</property> + </bean> + <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer"> + <property name="defaultMetaData"> + <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/> + </property> + </bean> + <bean name="InMemoryClassesDeployer" class="org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer"/> + <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/> + <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer"> + <property name="classLoading"><inject bean="ClassLoading"/></property> + </bean> + <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer"> + <property name="classLoading"><inject bean="ClassLoading"/></property> + <property name="system"><inject bean="ClassLoaderSystem"/></property> + </bean> + +</deployment>

17 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4396 - jbpm4/trunk/modules/examples/scripts.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-02 16:21:54 -0400 (Thu, 02 Apr 2009) New Revision: 4396 Modified: jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml Log: Fix test jar build Modified: jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml =================================================================== --- jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml 2009-04-02 20:01:33 UTC (rev 4395) +++ jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml 2009-04-02 20:21:54 UTC (rev 4396) @@ -96,7 +96,7 @@ <attribute name="pkg"/> <sequential> - <jar destfile="${build.dir}/test-libs/jbpm-(a){name}.jar"> + <jar destfile="${build.dir}/test-libs/jbpm-(a){name}.${archive.suffix}"> <fileset dir="${build.dir}/test-classes"> <include name="org/jbpm/examples/@{pkg}/**/*" /> <exclude name="**/process.jpdl.xml"/>

17 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4395 - in jbpm4/trunk: modules/examples and 1 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-02 16:01:33 -0400 (Thu, 02 Apr 2009) New Revision: 4395 Modified: jbpm4/trunk/modules/examples/pom.xml jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml jbpm4/trunk/pom.xml Log: TODO JBPM-2141: Distinguish deployment suffixes for integration tests Modified: jbpm4/trunk/modules/examples/pom.xml =================================================================== --- jbpm4/trunk/modules/examples/pom.xml 2009-04-02 19:34:49 UTC (rev 4394) +++ jbpm4/trunk/modules/examples/pom.xml 2009-04-02 20:01:33 UTC (rev 4395) @@ -84,6 +84,7 @@ <property name="build.dir" value="${project.build.directory}" /> <property name="test.resources.dir" value="${build.dir}/test-classes" /> <property name="build.finalName" value="${project.build.finalName}" /> + <property name="jbpm.target.container" value="${jbpm.target.container}"/> <ant antfile="scripts/antrun-test-jars.xml" target="build-jars" /> </tasks> </configuration> Modified: jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml =================================================================== --- jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml 2009-04-02 19:34:49 UTC (rev 4394) +++ jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml 2009-04-02 20:01:33 UTC (rev 4395) @@ -12,8 +12,20 @@ <description>Example test archives</description> +  + + <condition property="archive.suffix" value="jar" else="jpdl"> + <equals arg1="${jbpm.target.container}" arg2="jboss500"/> + </condition> + <target name="build-jars" description="Build the test modules."> + <echo>FIXME JBPM-2141: Deployment suffix ${archive.suffix} ***</echo> + <mkdir dir="${build.dir}/test-libs"/>  @@ -23,11 +35,11 @@ <test-jar name="EndMultipleTest" pkg="end/multiple"/>  - <test-jar name="EndProcessInstanceTest" pkg="end/processinstance"/> + <test-jar name="EndProcessInstanceTest" pkg="end/processinstance"/>  <test-jar name="EndStateTest" pkg="end/state"/> - +  <test-jar name="EsbTest" pkg="esb"/> @@ -83,7 +95,7 @@ <attribute name="name"/> <attribute name="pkg"/> - <sequential> + <sequential> <jar destfile="${build.dir}/test-libs/jbpm-(a){name}.jar"> <fileset dir="${build.dir}/test-classes"> <include name="org/jbpm/examples/@{pkg}/**/*" /> Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-04-02 19:34:49 UTC (rev 4394) +++ jbpm4/trunk/pom.xml 2009-04-02 20:01:33 UTC (rev 4395) @@ -509,7 +509,23 @@ </dependencies> </profile> +  <profile> + <id>no-target-container</id> + <activation> + <property> + <name>!jbpm.target.container</name> + </property> + </activation> + <properties> + <jbpm.target.container>jboss500</jbpm.target.container> + </properties> + </profile> + + <profile> <id>hsql</id> <activation> <property>

17 years, 1 month

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits April 2009