February 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r4010 - jbpm4/trunk/modules/distro/src/main/resources/installer.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-24 13:58:48 -0500 (Tue, 24 Feb 2009) New Revision: 4010 Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml Log: Copy oracle-ds.xml to docs/examples/jbpm Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-24 18:03:58 UTC (rev 4009) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-24 18:58:48 UTC (rev 4010) @@ -197,10 +197,12 @@ <include name="hibernate.cfg.hsqldb.xml"/> <include name="hibernate.cfg.mysql.xml"/> <include name="hibernate.cfg.postgresql.xml"/> + <include name="hibernate.cfg.oracle.xml"/> <include name="hibernate.cfg.sybase.xml"/> <include name="jbpm-hsqldb-ds.xml"/> <include name="jbpm-mysql-ds.xml"/> <include name="jbpm-postgresql-ds.xml"/> + <include name="jbpm-oracle-ds.xml"/> <include name="jbpm-sybase-ds.xml"/> </fileset>

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4009 - in jbpm4/trunk/modules: distro/src/main/resources/installer and 1 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-24 13:03:58 -0500 (Tue, 24 Feb 2009) New Revision: 4009 Added: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-oracle-ds.xml Modified: jbpm4/trunk/modules/distro/scripts/antrun-installer.xml jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml jbpm4/trunk/modules/distro/src/main/resources/installer/user-input-spec.xml Log: Installer: Added oracle as database choice. Removed postgresql. Make hypersonic the default choice Modified: jbpm4/trunk/modules/distro/scripts/antrun-installer.xml =================================================================== --- jbpm4/trunk/modules/distro/scripts/antrun-installer.xml 2009-02-24 18:02:17 UTC (rev 4008) +++ jbpm4/trunk/modules/distro/scripts/antrun-installer.xml 2009-02-24 18:03:58 UTC (rev 4009) @@ -82,6 +82,12 @@ <macro-enable file="${postgresql.cfg.xml}" section="DataSource properties"/> <macro-enable file="${postgresql.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"/> + <property name="sybase.cfg.xml" value="${deploy.artifacts.resources}/jbpm-jpdl-config/hibernate.cfg.sybase.xml"/> <macro-disable file="${sybase.cfg.xml}" section="JDBC connection properties"/> <macro-disable file="${sybase.cfg.xml}" section="Automatic schema creation"/> @@ -97,6 +103,9 @@ <condition property="database.is.postgresql" value="true" else="false"> <equals arg1="${database}" arg2="postgresql"/> </condition> + <condition property="database.is.oracle" value="true" else="false"> + <equals arg1="${database}" arg2="oracle"/> + </condition> <condition property="database.is.sybase" value="true" else="false"> <equals arg1="${database}" arg2="sybase"/> </condition> @@ -115,7 +124,8 @@ <filter token="database.is.hsqldb" value="${database.is.hsqldb}" /> <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="database.is.sybase" value="${database.is.sybase}" /> <filter token="jbpm.target.container" value="${jbpm.target.container}" /> <filter token="jboss.home" value="${jboss.home}" /> <filter token="product.version" value="${product.version}" /> Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-24 18:02:17 UTC (rev 4008) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-24 18:03:58 UTC (rev 4009) @@ -80,6 +80,10 @@ <name>dbSelection</name> <value>postgresql</value> </condition> + <condition type="variable" id="isOracle"> + <name>dbSelection</name> + <value>oracle</value> + </condition> <condition type="variable" id="isSybase"> <name>dbSelection</name> <value>sybase</value> @@ -278,6 +282,11 @@ <include name="mysql-connector-java.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" /> +   - <choice txt="Sybase" value="sybase"/> +  </spec> </field> </panel> Added: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-oracle-ds.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-oracle-ds.xml (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm-oracle-ds.xml 2009-02-24 18:03:58 UTC (rev 4009) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + + +<datasources> + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> +  + <isSameRM-override-value>false</isSameRM-override-value> + <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class> + <xa-datasource-property name="URL">${jdbc.oracle.url}</xa-datasource-property> + <xa-datasource-property name="User">${jdbc.oracle.username}</xa-datasource-property> + <xa-datasource-property name="Password">${jdbc.oracle.password}</xa-datasource-property> +  +  +  + <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name> +  + <no-tx-separate-pools/> + +  + <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>

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4008 - jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-24 13:02:17 -0500 (Tue, 24 Feb 2009) New Revision: 4008 Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java Log: Fix date comparison on task due date Modified: jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java 2009-02-24 10:39:10 UTC (rev 4007) +++ jbpm4/trunk/modules/test-db/src/main/java/org/jbpm/test/task/TaskCreateUpdateDeleteTest.java 2009-02-24 18:02:17 UTC (rev 4008) @@ -22,6 +22,7 @@ package org.jbpm.test.task; import java.util.Date; +import java.text.DateFormat; import org.jbpm.task.Task; import org.jbpm.test.JbpmTestCase; @@ -51,7 +52,10 @@ taskService.saveTask(task); // verify change is applied task = taskService.getTask(taskDbid); - assertEquals(dueDate, task.getDueDate()); + + // task.getDueDate() return an java.sql.Timestamp + DateFormat df = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG); + assertEquals(df.format(dueDate), df.format(task.getDueDate())); } public void testDeleteTask() {

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4007 - in jbpm4/trunk/modules/distro: src/main/resources/installer and 1 other directory.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-02-24 05:39:10 -0500 (Tue, 24 Feb 2009) New Revision: 4007 Removed: jbpm4/trunk/modules/distro/assembly-distro-package.xml jbpm4/trunk/modules/distro/assembly-jbpm-single-jar.xml Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml Log: Fix jBPM distribution on AS 4 Deleted: jbpm4/trunk/modules/distro/assembly-distro-package.xml =================================================================== --- jbpm4/trunk/modules/distro/assembly-distro-package.xml 2009-02-24 04:21:30 UTC (rev 4006) +++ jbpm4/trunk/modules/distro/assembly-distro-package.xml 2009-02-24 10:39:10 UTC (rev 4007) @@ -1,130 +0,0 @@ -<assembly> - <id>package</id> - <formats> - <format>zip</format> - <format>tar.gz</format> - </formats> - <includeBaseDirectory>true</includeBaseDirectory> - <baseDirectory>jbpm-${version}</baseDirectory> - - <dependencySets> - <dependencySet> - <includes> - <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> - </includes> - <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> - <outputDirectory>gpd</outputDirectory> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <scope>test</scope> - <excludes> - <exclude>jbpm-*</exclude> - </excludes> - </dependencySet> -  - </dependencySets> - - <fileSets> - <fileSet> - <directory>target</directory> - <includes> - <include>jbpm.jar</include> - </includes> - <outputDirectory></outputDirectory> - </fileSet> - <fileSet> - <directory>src/main/resources</directory> - <outputDirectory></outputDirectory> - </fileSet> - <fileSet> - <directory>../api/target/site/apidocs</directory> - <outputDirectory>doc/javadocs</outputDirectory> - </fileSet> - <fileSet> - <directory>../api/target/schemadoc</directory> - <outputDirectory>doc/schemadoc</outputDirectory> - </fileSet> - <fileSet> - <directory>../db/target/create</directory> - <outputDirectory>db/create</outputDirectory> - </fileSet> - <fileSet> - <directory>../db/target/drop</directory> - <outputDirectory>db/drop</outputDirectory> - </fileSet> - <fileSet> - <directory>../devguide/target/docbook/publish/en</directory> - <outputDirectory>doc/devguide</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../userguide/target/docbook/publish/en</directory> - <outputDirectory>doc/userguide</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../api/target/schemadocs</directory> - <outputDirectory>doc/schemadocs</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../api/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../api/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../log/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../pvm/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../pvm/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../jpdl/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../jpdl/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../test-base/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/test/java</directory> - <outputDirectory>examples/src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/test/resources</directory> - <outputDirectory>examples/src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/eclipse</directory> - <outputDirectory>examples</outputDirectory> - </fileSet> - </fileSets> -</assembly> \ No newline at end of file Deleted: jbpm4/trunk/modules/distro/assembly-jbpm-single-jar.xml =================================================================== --- jbpm4/trunk/modules/distro/assembly-jbpm-single-jar.xml 2009-02-24 04:21:30 UTC (rev 4006) +++ jbpm4/trunk/modules/distro/assembly-jbpm-single-jar.xml 2009-02-24 10:39:10 UTC (rev 4007) @@ -1,46 +0,0 @@ -<assembly> - <id>package</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <dependencySets> - <dependencySet> - <includes> - <include>org.jbpm.jbpm4:jbpm-api</include> - </includes> - <unpack>true</unpack> - <outputFileNameMapping></outputFileNameMapping> - <outputDirectory></outputDirectory> - </dependencySet> - <dependencySet> - <includes> - <include>org.jbpm.jbpm4:jbpm-log</include> - </includes> - <unpack>true</unpack> - <outputFileNameMapping></outputFileNameMapping> - <outputDirectory></outputDirectory> - </dependencySet> - <dependencySet> - <includes> - <include>org.jbpm.jbpm4:jbpm-pvm</include> - </includes> - <unpack>true</unpack> - <outputDirectory></outputDirectory> - </dependencySet> - <dependencySet> - <includes> - <include>org.jbpm.jbpm4:jbpm-jpdl</include> - </includes> - <unpack>true</unpack> - <outputDirectory></outputDirectory> - </dependencySet> - <dependencySet> - <includes> - <include>org.jbpm.jbpm4:jbpm-test-base</include> - </includes> - <unpack>true</unpack> - <outputDirectory></outputDirectory> - </dependencySet> - </dependencySets> -</assembly> \ No newline at end of file Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-24 04:21:30 UTC (rev 4006) +++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-24 10:39:10 UTC (rev 4007) @@ -201,12 +201,40 @@ </fileset>  + <fileset dir="@{deploy.artifacts.dir}/lib/" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib/" + override="true" + condition="isJBoss422"> + <include name="jbpm-api.jar"/> + <include name="jbpm-spi.jar"/> + </fileset> + + +  <fileset dir="@{deploy.artifacts.dir}/lib/" + targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib/" + override="true" + condition="isJBoss423"> + <include name="jbpm-api.jar"/> + <include name="jbpm-spi.jar"/> + </fileset> + +  + + <fileset dir="@{deploy.artifacts.dir}/lib/" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/jbpm.deployer" override="true" condition="isJBoss500"> @@ -249,8 +277,8 @@ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL"> <include name="mysql-connector-java.jar" /> </fileset> - - + +

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4006 - in jbpm3/trunk/modules/core/src: main/java/org/jbpm/job/executor and 1 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-02-23 23:21:30 -0500 (Mon, 23 Feb 2009) New Revision: 4006 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java Log: JBPM-2036: merged r4005 from branch 3.2.5.SP Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java 2009-02-23 18:37:53 UTC (rev 4005) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java 2009-02-24 04:21:30 UTC (rev 4006) @@ -24,10 +24,6 @@ public boolean execute(JbpmContext jbpmContext) throws Exception { log.debug("job["+id+"] executes "+action); - // add processInstance to autoSave field (For details refer to - // https://jira.jboss.org/jira/browse/JBPM-1015) - jbpmContext.addAutoSaveToken(token); - ExecutionContext executionContext = new ExecutionContext(token); executionContext.setAction(action); executionContext.setEvent(action.getEvent()); @@ -39,8 +35,6 @@ action.execute(executionContext); } - jbpmContext.save(processInstance); - return true; } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java 2009-02-23 18:37:53 UTC (rev 4005) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java 2009-02-24 04:21:30 UTC (rev 4006) @@ -23,14 +23,10 @@ public boolean execute(JbpmContext jbpmContext) throws Exception { log.debug("job["+id+"] executes "+node); - // add processInstance to autoSave field (For details refer to - // https://jira.jboss.org/jira/browse/JBPM-1015) - jbpmContext.addAutoSaveToken(token); - token.unlock(this.toString()); ExecutionContext executionContext = new ExecutionContext(token); node.execute(executionContext); - jbpmContext.save(processInstance); + return true; } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java 2009-02-23 18:37:53 UTC (rev 4005) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/Timer.java 2009-02-24 04:21:30 UTC (rev 4006) @@ -35,10 +35,6 @@ } public boolean execute(JbpmContext jbpmContext) throws Exception { - // add processInstance to autoSave field (For details refer to - // https://jira.jboss.org/jira/browse/JBPM-1015) - jbpmContext.addAutoSaveToken(token); - ExecutionContext executionContext = new ExecutionContext(token); executionContext.setTimer(this); @@ -87,19 +83,29 @@ token.signal(transitionName); } } - - // save the token - jbpmContext.save(processInstance); - + // if repeat is specified, reschedule the job if (repeat!=null) { - // suppose that it took the timer runner thread a + // suppose that it took the timer runner thread a // very long time to execute the timers. // then the repeat action dueDate could already have passed. - while (dueDate.getTime()<=System.currentTimeMillis()) { - dueDate = businessCalendar.add(dueDate, new Duration(repeat)); - } - log.debug("updated '"+this+"' for repetition on '"+formatDueDate(dueDate)+"'"); + Duration interval = new Duration(repeat); + long currentTime = System.currentTimeMillis(); + + Date repeatDate = dueDate; + do { + repeatDate = businessCalendar.add(repeatDate, interval); + } while (repeatDate.getTime() <= currentTime); + + log.debug("scheduling " + this + " for repeat on: " + formatDueDate(repeatDate)); + dueDate = repeatDate; + + // unlock timer so that: + // (a) any job executor thread can acquire it next time + // (b) other parts of the engine know it is not executing, and can be deleted + // see https://jira.jboss.org/jira/browse/JBPM-2036 + lockOwner = null; + return false; } @@ -128,10 +134,10 @@ return text.toString(); } - public static String formatDueDate(Date date) { + private static String formatDueDate(Date date) { return new SimpleDateFormat(dateFormat).format(date); } - + public String getRepeat() { return repeat; } Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2009-02-23 18:37:53 UTC (rev 4005) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2009-02-24 04:21:30 UTC (rev 4006) @@ -165,8 +165,12 @@ JobSession jobSession = jbpmContext.getJobSession(); job = jobSession.loadJob(job.getId()); + // register process instance for automatic save + // see https://jira.jboss.org/jira/browse/JBPM-1015 + jbpmContext.addAutoSaveProcessInstance(job.getProcessInstance()); + + log.debug("executing " + job); try { - log.debug("executing " + job); if (job.execute(jbpmContext)) { jobSession.deleteJob(job); } Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java 2009-02-23 18:37:53 UTC (rev 4005) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java 2009-02-24 04:21:30 UTC (rev 4006) @@ -1,5 +1,6 @@ package org.jbpm.jbpm2036; +import org.jbpm.context.exe.ContextInstance; import org.jbpm.db.AbstractDbTestCase; import org.jbpm.graph.def.ActionHandler; import org.jbpm.graph.def.ProcessDefinition; @@ -13,66 +14,68 @@ * @author Thomas.Diesler(a)jboss.com * @since 11-Feb-2009 */ -public class JBPM2036Test extends AbstractDbTestCase -{ - public void testTimerAction() - { +public class JBPM2036Test extends AbstractDbTestCase { + public void testTimerAction() { ProcessDefinition processDefinition = getProcessDefinition(); jbpmContext.deployProcessDefinition(processDefinition); newTransaction(); - try - { + try { ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.signal(); jbpmContext.save(processInstance); processJobs(30000); - long piId = processInstance.getId(); - assertTrue("expected process instance " + piId + " to have ended", - jbpmContext.loadProcessInstance(piId).hasEnded()); - assertEquals(1, TimerAction.getExecutionCount()); + processInstance = jbpmContext.loadProcessInstance(processInstance.getId()); + assertTrue("expected " + processInstance + " to have ended", processInstance.hasEnded()); + + ContextInstance contextInstance = processInstance.getContextInstance(); + assertEquals(1, contextInstance.getVariable("chaos")); + assertEquals(1, contextInstance.getVariable("undead")); } - finally - { + finally { graphSession.deleteProcessDefinition(processDefinition.getId()); } } - private ProcessDefinition getProcessDefinition() - { + private ProcessDefinition getProcessDefinition() { return ProcessDefinition.parseXmlString("<process-definition name='jbpm2036'>" + " <start-state name='start'>" + " <transition to='midway'/>" + " </start-state>" - + " <state name='midway'>" - + " <timer name='chaos' duedate='1 second' repeat='5 seconds'>" + + " <task-node name='midway'>" + + " <timer name='chaos' duedate='1 second' repeat='yes'>" + " <action class='" + TimerAction.class.getName() - + "' />" + + "'>" + + " <leave>true</leave>" + + " </action>" + " </timer>" + + " <task name='doit'>" + + " <timer name='undead' duedate='500 milliseconds' repeat='1 second'>" + + " <action class='" + + TimerAction.class.getName() + + "'/>" + + " </timer>" + + " </task>" + " <transition to='end'/>" - + " </state>" + + " </task-node>" + " <end-state name='end' />" + "</process-definition>"); } - public static class TimerAction implements ActionHandler - { - private static int executionCount = 0; + public static class TimerAction implements ActionHandler { + private boolean leave; private static final long serialVersionUID = 1L; - public void execute(ExecutionContext executionContext) throws Exception - { - executionContext.leaveNode(); - executionCount++; - } + public void execute(ExecutionContext executionContext) throws Exception { + String timerName = executionContext.getTimer().getName(); + Integer executionCount = (Integer) executionContext.getVariable(timerName); + executionContext.setVariable(timerName, executionCount != null ? executionCount + 1 : 1); - public static int getExecutionCount() - { - return executionCount; + if (leave) executionContext.leaveNode(); } } }

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4005 - in jbpm3/branches/jbpm-3.2.5.SP/modules/core/src: main/java/org/jbpm/job/executor and 1 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-02-23 13:37:53 -0500 (Mon, 23 Feb 2009) New Revision: 4005 Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/Timer.java jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java Log: JBPM-2036: unlock timer so that (a) any job executor thread can acquire it next time (b) other parts of the engine know it is not executing, and can be deleted Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java 2009-02-23 15:02:58 UTC (rev 4004) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/ExecuteActionJob.java 2009-02-23 18:37:53 UTC (rev 4005) @@ -24,10 +24,6 @@ public boolean execute(JbpmContext jbpmContext) throws Exception { log.debug("job["+id+"] executes "+action); - // add processInstance to autoSave field (For details refer to - // https://jira.jboss.org/jira/browse/JBPM-1015) - jbpmContext.addAutoSaveToken(token); - ExecutionContext executionContext = new ExecutionContext(token); executionContext.setAction(action); executionContext.setEvent(action.getEvent()); @@ -39,8 +35,6 @@ action.execute(executionContext); } - jbpmContext.save(processInstance); - return true; } Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java 2009-02-23 15:02:58 UTC (rev 4004) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/ExecuteNodeJob.java 2009-02-23 18:37:53 UTC (rev 4005) @@ -23,14 +23,10 @@ public boolean execute(JbpmContext jbpmContext) throws Exception { log.debug("job["+id+"] executes "+node); - // add processInstance to autoSave field (For details refer to - // https://jira.jboss.org/jira/browse/JBPM-1015) - jbpmContext.addAutoSaveToken(token); - token.unlock(this.toString()); ExecutionContext executionContext = new ExecutionContext(token); node.execute(executionContext); - jbpmContext.save(processInstance); + return true; } Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/Timer.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/Timer.java 2009-02-23 15:02:58 UTC (rev 4004) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/Timer.java 2009-02-23 18:37:53 UTC (rev 4005) @@ -35,10 +35,6 @@ } public boolean execute(JbpmContext jbpmContext) throws Exception { - // add processInstance to autoSave field (For details refer to - // https://jira.jboss.org/jira/browse/JBPM-1015) - jbpmContext.addAutoSaveToken(token); - ExecutionContext executionContext = new ExecutionContext(token); executionContext.setTimer(this); @@ -87,19 +83,29 @@ token.signal(transitionName); } } - - // save the token - jbpmContext.save(processInstance); - + // if repeat is specified, reschedule the job if (repeat!=null) { - // suppose that it took the timer runner thread a + // suppose that it took the timer runner thread a // very long time to execute the timers. // then the repeat action dueDate could already have passed. - while (dueDate.getTime()<=System.currentTimeMillis()) { - dueDate = businessCalendar.add(dueDate, new Duration(repeat)); - } - log.debug("updated '"+this+"' for repetition on '"+formatDueDate(dueDate)+"'"); + Duration interval = new Duration(repeat); + long currentTime = System.currentTimeMillis(); + + Date repeatDate = dueDate; + do { + repeatDate = businessCalendar.add(repeatDate, interval); + } while (repeatDate.getTime() <= currentTime); + + log.debug("scheduling " + this + " for repeat on: " + formatDueDate(repeatDate)); + dueDate = repeatDate; + + // unlock timer so that: + // (a) any job executor thread can acquire it next time + // (b) other parts of the engine know it is not executing, and can be deleted + // see https://jira.jboss.org/jira/browse/JBPM-2036 + lockOwner = null; + return false; } @@ -128,10 +134,10 @@ return text.toString(); } - public static String formatDueDate(Date date) { + private static String formatDueDate(Date date) { return new SimpleDateFormat(dateFormat).format(date); } - + public String getRepeat() { return repeat; } Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2009-02-23 15:02:58 UTC (rev 4004) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/main/java/org/jbpm/job/executor/JobExecutorThread.java 2009-02-23 18:37:53 UTC (rev 4005) @@ -161,8 +161,12 @@ JobSession jobSession = jbpmContext.getJobSession(); job = jobSession.loadJob(job.getId()); + // register process instance for automatic save + // see https://jira.jboss.org/jira/browse/JBPM-1015 + jbpmContext.addAutoSaveProcessInstance(job.getProcessInstance()); + + log.debug("executing " + job); try { - log.debug("executing " + job); if (job.execute(jbpmContext)) { jobSession.deleteJob(job); } Modified: jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java =================================================================== --- jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java 2009-02-23 15:02:58 UTC (rev 4004) +++ jbpm3/branches/jbpm-3.2.5.SP/modules/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java 2009-02-23 18:37:53 UTC (rev 4005) @@ -1,5 +1,6 @@ package org.jbpm.jbpm2036; +import org.jbpm.context.exe.ContextInstance; import org.jbpm.db.AbstractDbTestCase; import org.jbpm.graph.def.ActionHandler; import org.jbpm.graph.def.ProcessDefinition; @@ -13,66 +14,68 @@ * @author Thomas.Diesler(a)jboss.com * @since 11-Feb-2009 */ -public class JBPM2036Test extends AbstractDbTestCase -{ - public void testTimerAction() - { +public class JBPM2036Test extends AbstractDbTestCase { + public void testTimerAction() { ProcessDefinition processDefinition = getProcessDefinition(); jbpmContext.deployProcessDefinition(processDefinition); newTransaction(); - try - { + try { ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.signal(); jbpmContext.save(processInstance); processJobs(30000); - long piId = processInstance.getId(); - assertTrue("expected process instance " + piId + " to have ended", - jbpmContext.loadProcessInstance(piId).hasEnded()); - assertEquals(1, TimerAction.getExecutionCount()); + processInstance = jbpmContext.loadProcessInstance(processInstance.getId()); + assertTrue("expected " + processInstance + " to have ended", processInstance.hasEnded()); + + ContextInstance contextInstance = processInstance.getContextInstance(); + assertEquals(1, contextInstance.getVariable("chaos")); + assertEquals(1, contextInstance.getVariable("undead")); } - finally - { + finally { graphSession.deleteProcessDefinition(processDefinition.getId()); } } - private ProcessDefinition getProcessDefinition() - { + private ProcessDefinition getProcessDefinition() { return ProcessDefinition.parseXmlString("<process-definition name='jbpm2036'>" + " <start-state name='start'>" + " <transition to='midway'/>" + " </start-state>" - + " <state name='midway'>" - + " <timer name='chaos' duedate='1 second' repeat='5 seconds'>" + + " <task-node name='midway'>" + + " <timer name='chaos' duedate='1 second' repeat='yes'>" + " <action class='" + TimerAction.class.getName() - + "' />" + + "'>" + + " <leave>true</leave>" + + " </action>" + " </timer>" + + " <task name='doit'>" + + " <timer name='undead' duedate='500 milliseconds' repeat='1 second'>" + + " <action class='" + + TimerAction.class.getName() + + "'/>" + + " </timer>" + + " </task>" + " <transition to='end'/>" - + " </state>" + + " </task-node>" + " <end-state name='end' />" + "</process-definition>"); } - public static class TimerAction implements ActionHandler - { - private static int executionCount = 0; + public static class TimerAction implements ActionHandler { + private boolean leave; private static final long serialVersionUID = 1L; - public void execute(ExecutionContext executionContext) throws Exception - { - executionContext.leaveNode(); - executionCount++; - } + public void execute(ExecutionContext executionContext) throws Exception { + String timerName = executionContext.getTimer().getName(); + Integer executionCount = (Integer) executionContext.getVariable(timerName); + executionContext.setVariable(timerName, executionCount != null ? executionCount + 1 : 1); - public static int getExecutionCount() - { - return executionCount; + if (leave) executionContext.leaveNode(); } } }

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4004 - in jbpm4/trunk/modules/userguide/src/main/docbook/en: modules and 1 other directory.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-02-23 10:02:58 -0500 (Mon, 23 Feb 2009) New Revision: 4004 Added: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch08-Identity.xml Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml Log: adding identity chapter to user docs Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml 2009-02-23 15:02:35 UTC (rev 4003) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml 2009-02-23 15:02:58 UTC (rev 4004) @@ -8,6 +8,7 @@ <!ENTITY ch05-Jpdl SYSTEM "modules/ch05-Jpdl.xml"> <!ENTITY ch06-Variables SYSTEM "modules/ch06-Variables.xml"> <!ENTITY ch07-Scripting SYSTEM "modules/ch07-Scripting.xml"> + <!ENTITY ch08-Identity SYSTEM "modules/ch08-Identity.xml"> ]> <book lang="en"> @@ -25,5 +26,6 @@ &ch05-Jpdl; &ch06-Variables; &ch07-Scripting; + &ch08-Identity; </book> \ No newline at end of file Copied: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch08-Identity.xml (from rev 4001, jbpm4/branches/jbpm-4.0.0.Alpha2/modules/userguide/src/main/docbook/en/modules/ch08-Identity.xml) =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch08-Identity.xml (rev 0) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch08-Identity.xml 2009-02-23 15:02:58 UTC (rev 4004) @@ -0,0 +1,38 @@ +<chapter id="identity"> + <title>Identity</title> + + <para>The default jBPM identity component is based on + <ulink url="http://www.jboss.org/community/docs/DOC-13258">JBoss IDM</ulink>. + Configuration is like this: + </para> + + <programlisting><jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <emphasis role="bold"><process-engine-context></emphasis> + ... + <identity-service /> + ... + </process-engine-context> + + <transaction-context> + ... + <emphasis role="bold"><identity-session realm="realm://jbpm-identity" /></emphasis> + </transaction-context> + +</jbpm-configuration></programlisting> + + <para>To replace the identity component, keep the identity-service declaration, + implement org.jbpm.session.IdentitySession and configure your identity session in + the transaction context like this: + </para> + + <programlisting><jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + ... + <transaction-context> + ... + <object class="your.package.YourIdentitySession" /> + </transaction-context> + +</jbpm-configuration></programlisting> + +</chapter>

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4003 - in jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples: script/text and 1 other directory.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-02-23 10:02:35 -0500 (Mon, 23 Feb 2009) New Revision: 4003 Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/Person.java Log: removed example warnings 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-02-23 15:02:16 UTC (rev 4002) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/esb/EsbTest.java 2009-02-23 15:02:35 UTC (rev 4003) @@ -57,7 +57,7 @@ Map<String, Object> variables = new HashMap<String, Object>(); variables.put("title", "Internetworking with TCP/IP"); - Execution execution = executionService.startProcessInstanceByKey("Esb", variables); + executionService.startProcessInstanceByKey("Esb", variables); Message message = courier.getMessage(); Body body = message.getBody(); Modified: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/Person.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/Person.java 2009-02-23 15:02:16 UTC (rev 4002) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/text/Person.java 2009-02-23 15:02:35 UTC (rev 4003) @@ -28,6 +28,8 @@ */ public class Person implements Serializable { + private static final long serialVersionUID = 1L; + String address; public Person(String address) {

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4002 - jbpm4/trunk.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-02-23 10:02:16 -0500 (Mon, 23 Feb 2009) New Revision: 4002 Modified: jbpm4/trunk/build.xml Log: extracted eclipse install and eclipse start as separate build targets Modified: jbpm4/trunk/build.xml =================================================================== --- jbpm4/trunk/build.xml 2009-02-23 12:44:24 UTC (rev 4001) +++ jbpm4/trunk/build.xml 2009-02-23 15:02:16 UTC (rev 4002) @@ -76,6 +76,16 @@ </exec> </target> + <target name="distro.eclipse.install"> + <unzip src="${distro.eclipse}" dest="${distro.installation.dir}/jbpm-${distro.version}" /> + </target> + + <target name="distro.eclipse.start"> + <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> + <arg line="/C start "${distro.installation.dir}/jbpm-${distro.version}/eclipse/eclipse.exe" "-data" "${distro.installation.dir}/jbpm-${distro.version}/workspace"" /> + </exec> + </target> + <target name="schemadocs"> <exec executable="${mvn.executable}" dir="modules/api"> <arg line="-Pschemadocs package" />

17 years, 2 months

1
0
0 / 0

JBoss JBPM SVN: r4001 - in jbpm4/branches/jbpm-4.0.0.Alpha2/modules/userguide/src/main/docbook/en: modules and 1 other directory.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-02-23 07:44:24 -0500 (Mon, 23 Feb 2009) New Revision: 4001 Added: jbpm4/branches/jbpm-4.0.0.Alpha2/modules/userguide/src/main/docbook/en/modules/ch08-Identity.xml Modified: jbpm4/branches/jbpm-4.0.0.Alpha2/modules/userguide/src/main/docbook/en/master.xml Log: added identity docs Modified: jbpm4/branches/jbpm-4.0.0.Alpha2/modules/userguide/src/main/docbook/en/master.xml =================================================================== --- jbpm4/branches/jbpm-4.0.0.Alpha2/modules/userguide/src/main/docbook/en/master.xml 2009-02-23 12:27:17 UTC (rev 4000) +++ jbpm4/branches/jbpm-4.0.0.Alpha2/modules/userguide/src/main/docbook/en/master.xml 2009-02-23 12:44:24 UTC (rev 4001) @@ -8,6 +8,7 @@ <!ENTITY ch05-Jpdl SYSTEM "modules/ch05-Jpdl.xml"> <!ENTITY ch06-Variables SYSTEM "modules/ch06-Variables.xml"> <!ENTITY ch07-Scripting SYSTEM "modules/ch07-Scripting.xml"> + <!ENTITY ch08-Identity SYSTEM "modules/ch08-Identity.xml"> ]> <book lang="en"> @@ -25,5 +26,6 @@ &ch05-Jpdl; &ch06-Variables; &ch07-Scripting; + &ch08-Identity; </book> \ No newline at end of file Added: jbpm4/branches/jbpm-4.0.0.Alpha2/modules/userguide/src/main/docbook/en/modules/ch08-Identity.xml =================================================================== --- jbpm4/branches/jbpm-4.0.0.Alpha2/modules/userguide/src/main/docbook/en/modules/ch08-Identity.xml (rev 0) +++ jbpm4/branches/jbpm-4.0.0.Alpha2/modules/userguide/src/main/docbook/en/modules/ch08-Identity.xml 2009-02-23 12:44:24 UTC (rev 4001) @@ -0,0 +1,38 @@ +<chapter id="identity"> + <title>Identity</title> + + <para>The default jBPM identity component is based on + <ulink url="http://www.jboss.org/community/docs/DOC-13258">JBoss IDM</ulink>. + Configuration is like this: + </para> + + <programlisting><jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <emphasis role="bold"><process-engine-context></emphasis> + ... + <identity-service /> + ... + </process-engine-context> + + <transaction-context> + ... + <emphasis role="bold"><identity-session realm="realm://jbpm-identity" /></emphasis> + </transaction-context> + +</jbpm-configuration></programlisting> + + <para>To replace the identity component, keep the identity-service declaration, + implement org.jbpm.session.IdentitySession and configure your identity session in + the transaction context like this: + </para> + + <programlisting><jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + ... + <transaction-context> + ... + <object class="your.package.YourIdentitySession" /> + </transaction-context> + +</jbpm-configuration></programlisting> + +</chapter> Property changes on: jbpm4/branches/jbpm-4.0.0.Alpha2/modules/userguide/src/main/docbook/en/modules/ch08-Identity.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 2 months

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 February 2009