JBoss JBPM SVN: r3445 - projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-19 08:05:31 -0500 (Fri, 19 Dec 2008)
New Revision: 3445
Modified:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java
Log:
Take out help panel
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-12-19 13:04:04 UTC (rev 3444)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionListEditor.java 2008-12-19 13:05:31 UTC (rev 3445)
@@ -158,13 +158,13 @@
// ----------------------------------
- HelpPanel help = new HelpPanel(UIConstants.TEASER_PANEL_WIDTH, 180, "About process definitions");
- help.setContent( "");
+ //HelpPanel help = new HelpPanel(UIConstants.TEASER_PANEL_WIDTH, 180, "About process definitions");
+ //help.setContent( "");
// ----------------------------------
teaserPanel = new TeaserPanel();
- teaserPanel.add(help);
+ //teaserPanel.add(help);
// ----------------------------------
17 years, 4 months
JBoss JBPM SVN: r3444 - projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-12-19 08:04:04 -0500 (Fri, 19 Dec 2008)
New Revision: 3444
Modified:
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java
Log:
JBPM-1934: Revert to orig task management impl
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java 2008-12-19 11:07:31 UTC (rev 3443)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ManagementFactoryImpl.java 2008-12-19 13:04:04 UTC (rev 3444)
@@ -57,7 +57,7 @@
public TaskManagement createTaskManagement()
{
- if (useSpecIntegration)
+ /*if (useSpecIntegration)
{
return (TaskManagement)InvocationProxy.newInstance(new TaskManagementImpl());
}
@@ -65,6 +65,9 @@
{
return (TaskManagement)JBPM3InvocationProxy.newInstance(new JBPM3TaskManagement());
}
+ */
+
+ return (TaskManagement)JBPM3InvocationProxy.newInstance(new JBPM3TaskManagement());
}
public UserManagement createUserManagement()
17 years, 4 months
JBoss JBPM SVN: r3443 - in jbpm3/trunk/modules/core: src/test/java/org/jbpm/jbpm1072 and 1 other directories.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-19 06:07:31 -0500 (Fri, 19 Dec 2008)
New Revision: 3443
Modified:
jbpm3/trunk/modules/core/pom.xml
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java
Log:
Remove (won't fix) excludes from surefire
Modified: jbpm3/trunk/modules/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/core/pom.xml 2008-12-19 10:21:29 UTC (rev 3442)
+++ jbpm3/trunk/modules/core/pom.xml 2008-12-19 11:07:31 UTC (rev 3443)
@@ -223,10 +223,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
- <!-- [JBPM-983] concurrent process execution fails -->
- <exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude>
- <!-- [JBPM-1072] Concurrent JobExecutors can process the same job in parallel -->
- <exclude>org/jbpm/jbpm1072/JBPM1072Test.java</exclude>
<!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema -->
<exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
</excludes>
@@ -254,10 +250,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
- <!-- Won't Fix [JBPM-983] concurrent process execution fails -->
- <exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude>
- <!-- Won't Fix [JBPM-1072] Concurrent JobExecutors can process the same job in parallel -->
- <exclude>org/jbpm/jbpm1072/JBPM1072Test.java</exclude>
<!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema -->
<exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
</excludes>
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java 2008-12-19 10:21:29 UTC (rev 3442)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm1072/JBPM1072Test.java 2008-12-19 11:07:31 UTC (rev 3443)
@@ -94,9 +94,16 @@
EventCallback.clear();
}
- public void testMultipleJobExecutors() {
+ public void testMultipleJobExecutors()
+ {
executionCount = 0;
+ // Won't Fix [JBPM-1072] Concurrent JobExecutors can process the same job in parallel
+ if (getHibernateDialect().indexOf("HSQL") != -1)
+ {
+ return;
+ }
+
// kick off process instance
ProcessDefinition processDefinition = graphSession.loadProcessDefinition(processDefinitionId);
ProcessInstance processInstance = new ProcessInstance(processDefinition);
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java 2008-12-19 10:21:29 UTC (rev 3442)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jbpm983/JBPM983Test.java 2008-12-19 11:07:31 UTC (rev 3443)
@@ -119,7 +119,14 @@
+ "</end-state>"
+ "</process-definition>";
- public void testConcurrentJobs() throws Exception {
+ public void testConcurrentJobs() throws Exception
+ {
+ // Won't Fix [JBPM-983] concurrent process execution fails
+ if (getHibernateDialect().indexOf("HSQL") != -1)
+ {
+ return;
+ }
+
// create test properties
Map testVariables = new HashMap();
testVariables.put("test", "true");
17 years, 4 months
JBoss JBPM SVN: r3442 - in jbpm4/trunk: modules/api/src/main/resources and 5 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-19 05:21:29 -0500 (Fri, 19 Dec 2008)
New Revision: 3442
Added:
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/
jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/process.jpdl.xml
Modified:
jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd
jbpm4/trunk/modules/jpdl/pom.xml
jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ScriptBinding.java
jbpm4/trunk/pom.xml
Log:
added script expression test and esb dependencies
Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd
===================================================================
--- jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2008-12-19 09:20:00 UTC (rev 3441)
+++ jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2008-12-19 10:21:29 UTC (rev 3442)
@@ -343,7 +343,7 @@
<complexType name="scriptType">
<sequence>
- <element name="text" type="string">
+ <element name="text" type="string" minOccurs="0">
<annotation><documentation>The content of this expression element
is the script text that will be evaluated. This is mutually
exclusive with the expression attribute.</documentation></annotation>
Added: 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 (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java 2008-12-19 10:21:29 UTC (rev 3442)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.examples.script.expression;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jbpm.Execution;
+import org.jbpm.examples.script.text.Person;
+import org.jbpm.test.DbTestCase;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class ScriptExpressionTest extends DbTestCase {
+
+ public void testScriptText() {
+ deployJpdlResource("org/jbpm/examples/script/expression/process.jpdl.xml");
+
+ Map<String, Object> variables = new HashMap<String, Object>();
+ variables.put("person", new Person("Honolulu"));
+
+ Execution execution = executionService.startExecutionByKey("ScriptExpression", variables);
+ String executionId = execution.getId();
+
+ String text = (String) executionService.getVariable(executionId, "text");
+ assertTextPresent("Send packet to Honolulu", text);
+ }
+
+}
Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/script/expression/ScriptExpressionTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/process.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/process.jpdl.xml 2008-12-19 10:21:29 UTC (rev 3442)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="ScriptExpression" xmlns="http://jbpm.org/4/jpdl">
+
+ <start>
+ <flow to="invoke script" />
+ </start>
+
+ <script name="invoke script"
+ expr="Send packet to #{person.address}"
+ var="text">
+
+ <flow to="wait" />
+ </script>
+
+ <state name="wait" />
+
+</process>
Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/script/expression/process.jpdl.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm4/trunk/modules/jpdl/pom.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/pom.xml 2008-12-19 09:20:00 UTC (rev 3441)
+++ jbpm4/trunk/modules/jpdl/pom.xml 2008-12-19 10:21:29 UTC (rev 3442)
@@ -44,6 +44,14 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm4.dependencies.esb</groupId>
+ <artifactId>jbossesb-rosetta</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm4.dependencies.esb</groupId>
+ <artifactId>test-util</artifactId>
+ </dependency>
</dependencies>
<!-- Plugins -->
Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ScriptBinding.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ScriptBinding.java 2008-12-19 09:20:00 UTC (rev 3441)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ScriptBinding.java 2008-12-19 10:21:29 UTC (rev 3442)
@@ -41,12 +41,11 @@
}
public Object parse(Element element, Parse parse, Parser parser) {
- String script = null;
String language = null;
- String expr = XmlUtil.attribute(element, "expr");
+ String script = XmlUtil.attribute(element, "expr");
Element textElement = XmlUtil.element(element, "text");
- if(expr!=null) {
+ if(script!=null) {
ScriptManager scriptManager = Environment.getFromCurrent(ScriptManager.class);
language = scriptManager.getDefaultExpressionLanguage();
if (textElement!=null) {
Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml 2008-12-19 09:20:00 UTC (rev 3441)
+++ jbpm4/trunk/pom.xml 2008-12-19 10:21:29 UTC (rev 3442)
@@ -49,6 +49,7 @@
<hibernate.version>3.2.6.ga</hibernate.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
<jboss.j2ee.version>4.2.1.GA</jboss.j2ee.version>
+ <jbossesb.version>4.4.0.GA</jbossesb.version>
<jsr233.version>2.0.3</jsr233.version>
<juel.version>2.1.0</juel.version>
<log4j.version>1.2.14</log4j.version>
@@ -56,12 +57,9 @@
<servlet-api.version>2.5</servlet-api.version>
<cactus.version>13-1.7.1</cactus.version>
<junit.version>3.8.1</junit.version>
-
+ <stax.api.version>1.0.1</stax.api.version>
<!--
<cactus.version>13-1.7.1</cactus.version>
- <jboss.seam.version>2.0.1.GA</jboss.seam.version>
- <clover.version>2.3.1</clover.version>
- <slf4j.version>1.5.3</slf4j.version>
-->
</properties>
@@ -111,6 +109,16 @@
<version>${jboss.j2ee.version}</version>
</dependency>
<dependency>
+ <groupId>org.jbpm.jbpm4.dependencies.esb</groupId>
+ <artifactId>jbossesb-rosetta</artifactId>
+ <version>${jbossesb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm4.dependencies.esb</groupId>
+ <artifactId>test-util</artifactId>
+ <version>${jbossesb.version}</version>
+ </dependency>
+ <dependency>
<groupId>juel</groupId>
<artifactId>juel</artifactId>
<version>${juel.version}</version>
17 years, 4 months
JBoss JBPM SVN: r3441 - jbpm3/trunk/modules/core/src/main/etc.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-19 04:20:00 -0500 (Fri, 19 Dec 2008)
New Revision: 3441
Modified:
jbpm3/trunk/modules/core/src/main/etc/jbpm-jpdl-3.3.1-api.txt
Log:
[JBPM-1919] update to current API snapshot
Modified: jbpm3/trunk/modules/core/src/main/etc/jbpm-jpdl-3.3.1-api.txt
===================================================================
--- jbpm3/trunk/modules/core/src/main/etc/jbpm-jpdl-3.3.1-api.txt 2008-12-19 09:09:49 UTC (rev 3440)
+++ jbpm3/trunk/modules/core/src/main/etc/jbpm-jpdl-3.3.1-api.txt 2008-12-19 09:20:00 UTC (rev 3441)
@@ -148,7 +148,8 @@
}
Compiled from "AbstractCancelCommand.java"
-public class org.jbpm.command.AbstractCancelCommand extends java.lang.Object implements java.io.Serializable{
+public abstract class org.jbpm.command.AbstractCancelCommand extends org.jbpm.command.AbstractBaseCommand{
+ public static java.lang.String CANCELLATION_INDICATOR_VARIABLE_NAME;
protected transient org.jbpm.JbpmContext jbpmContext;
protected static final org.apache.commons.logging.Log log;
public org.jbpm.command.AbstractCancelCommand();
@@ -177,6 +178,9 @@
public void setVariablesToInclude(java.lang.String);
protected org.jbpm.JbpmContext getJbpmContext();
protected void setJbpmContext(org.jbpm.JbpmContext);
+ public org.jbpm.command.AbstractGetObjectBaseCommand variablesToInclude(java.lang.String[]);
+ public org.jbpm.command.AbstractGetObjectBaseCommand variablesToInclude(java.lang.String);
+ public org.jbpm.command.AbstractGetObjectBaseCommand includeAllVariables(boolean);
}
Compiled from "AbstractProcessInstanceBaseCommand.java"
@@ -186,16 +190,22 @@
protected org.jbpm.JbpmContext getJbpmContext();
public java.lang.Object execute(org.jbpm.JbpmContext) throws java.lang.Exception;
public abstract org.jbpm.graph.exe.ProcessInstance execute(org.jbpm.graph.exe.ProcessInstance);
- public org.jbpm.command.AbstractProcessInstanceBaseCommand setProcessInstanceIds(long[]);
- public org.jbpm.command.AbstractProcessInstanceBaseCommand setProcessInstanceId(long);
+ public void setProcessInstanceIds(long[]);
+ public void setProcessInstanceId(long);
public java.lang.String toString();
public java.lang.String getProcessName();
- public org.jbpm.command.AbstractProcessInstanceBaseCommand setProcessName(java.lang.String);
+ public void setProcessName(java.lang.String);
public int getProcessVersion();
- public org.jbpm.command.AbstractProcessInstanceBaseCommand setProcessVersion(int);
+ public void setProcessVersion(int);
public long[] getProcessInstanceIds();
+ public long getProcessInstanceId();
public boolean isOnlyRunning();
- public org.jbpm.command.AbstractProcessInstanceBaseCommand setOnlyRunning(boolean);
+ public void setOnlyRunning(boolean);
+ public org.jbpm.command.AbstractProcessInstanceBaseCommand processInstanceIds(long[]);
+ public org.jbpm.command.AbstractProcessInstanceBaseCommand processInstanceId(long);
+ public org.jbpm.command.AbstractProcessInstanceBaseCommand processName(java.lang.String);
+ public org.jbpm.command.AbstractProcessInstanceBaseCommand processVersion(int);
+ public org.jbpm.command.AbstractProcessInstanceBaseCommand onlyRunning(boolean);
}
Compiled from "AbstractTokenBaseCommand.java"
@@ -205,9 +215,8 @@
protected org.jbpm.JbpmContext getJbpmContext();
public java.lang.Object execute(org.jbpm.JbpmContext) throws java.lang.Exception;
public abstract java.lang.Object execute(org.jbpm.graph.exe.Token);
- public org.jbpm.command.AbstractTokenBaseCommand setTokenIds(long[]);
- public org.jbpm.command.AbstractTokenBaseCommand setTokenId(long);
- public java.lang.String toString();
+ public void setTokenIds(long[]);
+ public void setTokenId(long);
public java.lang.String getAdditionalToStringInformation();
public java.lang.String getProcessName();
public void setProcessName(java.lang.String);
@@ -216,6 +225,13 @@
public java.lang.String getStateName();
public void setStateName(java.lang.String);
public long[] getTokenIds();
+ public long getTokenId();
+ public java.lang.String toString();
+ public org.jbpm.command.AbstractTokenBaseCommand tokenIds(long[]);
+ public org.jbpm.command.AbstractTokenBaseCommand tokenId(long);
+ public org.jbpm.command.AbstractTokenBaseCommand processName(java.lang.String);
+ public org.jbpm.command.AbstractTokenBaseCommand processVersion(int);
+ public org.jbpm.command.AbstractTokenBaseCommand stateName(java.lang.String);
}
Compiled from "AsynchronousCommand.java"
@@ -233,25 +249,33 @@
public java.util.Date getInStateAtLeastSince();
public void setInStateAtLeastSince(java.util.Date);
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.BatchSignalCommand transitionName(java.lang.String);
+ public org.jbpm.command.BatchSignalCommand inStateAtLeastSince(java.util.Date);
}
Compiled from "CancelProcessInstanceCommand.java"
-public class org.jbpm.command.CancelProcessInstanceCommand extends org.jbpm.command.AbstractCancelCommand implements org.jbpm.command.Command{
+public class org.jbpm.command.CancelProcessInstanceCommand extends org.jbpm.command.AbstractCancelCommand{
public org.jbpm.command.CancelProcessInstanceCommand();
public org.jbpm.command.CancelProcessInstanceCommand(long);
public java.lang.Object execute(org.jbpm.JbpmContext) throws java.lang.Exception;
protected void cancelProcess(long);
+ public long getProcessInstanceId();
+ public void setProcessInstanceId(long);
public long getProcessId();
public void setProcessId(long);
+ public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.CancelProcessInstanceCommand processInstanceId(long);
}
Compiled from "CancelTokenCommand.java"
-public class org.jbpm.command.CancelTokenCommand extends org.jbpm.command.AbstractCancelCommand implements org.jbpm.command.Command{
+public class org.jbpm.command.CancelTokenCommand extends org.jbpm.command.AbstractCancelCommand{
public org.jbpm.command.CancelTokenCommand();
public org.jbpm.command.CancelTokenCommand(long);
public java.lang.Object execute(org.jbpm.JbpmContext) throws java.lang.Exception;
public long getTokenId();
public void setTokenId(long);
+ public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.CancelTokenCommand tokenId(long);
}
Compiled from "CancelWorkOnTaskCommand.java"
@@ -262,6 +286,7 @@
public long getTaskInstanceId();
public void setTaskInstanceId(long);
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.CancelWorkOnTaskCommand taskInstanceId(long);
}
Compiled from "ChangeProcessInstanceVersionCommand.java"
@@ -271,15 +296,20 @@
public java.lang.String getAdditionalToStringInformation();
public org.jbpm.graph.exe.ProcessInstance execute(org.jbpm.graph.exe.ProcessInstance);
public java.util.Map getNodeNameMapping();
- public org.jbpm.command.ChangeProcessInstanceVersionCommand setNodeNameMapping(java.util.Map);
+ public void setNodeNameMapping(java.util.Map);
public int getNewVersion();
- public org.jbpm.command.ChangeProcessInstanceVersionCommand setNewVersion(int);
+ public void setNewVersion(int);
public java.util.Map getTaskNameMapping();
- public org.jbpm.command.ChangeProcessInstanceVersionCommand setTaskNameMapping(java.util.Map);
+ public void setTaskNameMapping(java.util.Map);
public long getProcessId();
public void setProcessId(long);
public java.util.Map getNameMapping();
- public org.jbpm.command.ChangeProcessInstanceVersionCommand setNameMapping(java.util.Map);
+ public void setNameMapping(java.util.Map);
+ public org.jbpm.command.ChangeProcessInstanceVersionCommand nodeNameMapping(java.util.Map);
+ public org.jbpm.command.ChangeProcessInstanceVersionCommand newVersion(int);
+ public org.jbpm.command.ChangeProcessInstanceVersionCommand taskNameMapping(java.util.Map);
+ public org.jbpm.command.ChangeProcessInstanceVersionCommand nodeNameMappingAdd(java.lang.String, java.lang.String);
+ public org.jbpm.command.ChangeProcessInstanceVersionCommand taskNameMappingAdd(java.lang.String, java.lang.String);
}
Compiled from "Command.java"
@@ -303,9 +333,13 @@
Compiled from "DeleteProcessDefinitionCommand.java"
public class org.jbpm.command.DeleteProcessDefinitionCommand extends org.jbpm.command.AbstractGetObjectBaseCommand{
+ public org.jbpm.command.DeleteProcessDefinitionCommand();
public org.jbpm.command.DeleteProcessDefinitionCommand(long);
public java.lang.Object execute(org.jbpm.JbpmContext) throws java.lang.Exception;
public java.lang.String toString();
+ public long getId();
+ public void setId(long);
+ public org.jbpm.command.DeleteProcessDefinitionCommand id(long);
}
Compiled from "DeployProcessCommand.java"
@@ -318,6 +352,8 @@
public void setPar(byte[]);
public java.lang.String getXml();
public void setXml(java.lang.String);
+ public org.jbpm.command.DeployProcessCommand xml(java.lang.String);
+ public org.jbpm.command.DeployProcessCommand par(byte[]);
}
Compiled from "ExecuteJobsCommand.java"
@@ -340,6 +376,8 @@
public int getVersion();
public void setVersion(int);
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.GetProcessDefinitionCommand version(int);
+ public org.jbpm.command.GetProcessDefinitionCommand name(java.lang.String);
}
Compiled from "GetProcessDefinitionsCommand.java"
@@ -350,6 +388,7 @@
public boolean isOnlyLatest();
public void setOnlyLatest(boolean);
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.GetProcessDefinitionsCommand onlyLatest(boolean);
}
Compiled from "GetProcessInstanceCommand.java"
@@ -365,6 +404,9 @@
public long getTokenId();
public void setTokenId(long);
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.GetProcessInstanceCommand processInstanceId(long);
+ public org.jbpm.command.GetProcessInstanceCommand taskInstanceId(long);
+ public org.jbpm.command.GetProcessInstanceCommand tokenId(long);
}
Compiled from "GetProcessInstanceLogCommand.java"
@@ -378,6 +420,7 @@
public long getProcessInstanceId();
public void setProcessInstanceId(long);
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.GetProcessInstanceLogCommand processInstanceId(long);
}
Compiled from "GetProcessInstancesCommand.java"
@@ -391,15 +434,26 @@
public void setOnlyRunning(boolean);
public java.lang.String getProcessName();
public void setProcessName(java.lang.String);
+ public java.lang.String getProcessDefinitionName();
+ public void setProcessDefinitionName(java.lang.String);
public java.lang.String getStateName();
public void setStateName(java.lang.String);
public java.util.Date getUntilStartDate();
public void setUntilStartDate(java.util.Date);
public java.lang.String getVersion();
public void setVersion(java.lang.String);
+ public long getProcessInstanceId();
+ public void setProcessInstanceId(long);
public long getProcessId();
public void setProcessId(long);
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.GetProcessInstancesCommand fromStartDate(java.util.Date);
+ public org.jbpm.command.GetProcessInstancesCommand onlyRunning(boolean);
+ public org.jbpm.command.GetProcessInstancesCommand processDefinitionName(java.lang.String);
+ public org.jbpm.command.GetProcessInstancesCommand stateName(java.lang.String);
+ public org.jbpm.command.GetProcessInstancesCommand untilStartDate(java.util.Date);
+ public org.jbpm.command.GetProcessInstancesCommand version(java.lang.String);
+ public org.jbpm.command.GetProcessInstancesCommand processInstanceId(long);
}
Compiled from "GetTaskInstanceCommand.java"
@@ -416,6 +470,9 @@
public long getProcessInstanceId();
public void setProcessInstanceId(long);
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.GetTaskInstanceCommand taskInstanceId(long);
+ public org.jbpm.command.GetTaskInstanceCommand tokenId(long);
+ public org.jbpm.command.GetTaskInstanceCommand processInstanceId(long);
}
Compiled from "GetTaskListCommand.java"
@@ -429,6 +486,8 @@
public void setActor(java.lang.String);
public void setActor(java.lang.String[]);
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.GetTaskListCommand actor(java.lang.String);
+ public org.jbpm.command.GetTaskListCommand actor(java.lang.String[]);
}
Compiled from "CommandServiceImpl.java"
@@ -445,6 +504,8 @@
public java.lang.Object execute(org.jbpm.JbpmContext) throws java.lang.Exception;
public java.lang.String getActorId();
public void setActorId(java.lang.String);
+ public long getProcessDefinitionId();
+ public void setProcessDefinitionId(long);
public long getProcessId();
public void setProcessId(long);
public java.lang.String getProcessName();
@@ -452,10 +513,18 @@
public boolean isCreateStartTask();
public void setCreateStartTask(boolean);
public java.util.Map getVariables();
+ public java.lang.String getProcessDefinitionName();
+ public void setProcessDefinitionName(java.lang.String);
public void setVariables(java.util.Map);
public java.lang.String getKey();
public void setKey(java.lang.String);
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.NewProcessInstanceCommand actorId(java.lang.String);
+ public org.jbpm.command.NewProcessInstanceCommand processDefinitionId(long);
+ public org.jbpm.command.NewProcessInstanceCommand processDefinitionName(java.lang.String);
+ public org.jbpm.command.NewProcessInstanceCommand createStartTask(boolean);
+ public org.jbpm.command.NewProcessInstanceCommand variables(java.util.Map);
+ public org.jbpm.command.NewProcessInstanceCommand key(java.lang.String);
}
Compiled from "ResumeProcessInstanceCommand.java"
@@ -486,6 +555,10 @@
public java.lang.String getExpectedStateName();
public void setExpectedStateName(java.lang.String);
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.SignalCommand tokenId(long);
+ public org.jbpm.command.SignalCommand transitionName(java.lang.String);
+ public org.jbpm.command.SignalCommand variables(java.util.Map);
+ public org.jbpm.command.SignalCommand expectedStateName(java.lang.String);
}
Compiled from "StartProcessInstanceCommand.java"
@@ -495,6 +568,7 @@
public java.lang.String getStartTransitionName();
public void setStartTransitionName(java.lang.String);
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.StartProcessInstanceCommand startTransitionName(java.lang.String);
}
Compiled from "StartWorkOnTaskCommand.java"
@@ -509,6 +583,9 @@
public void setActorId(java.lang.String);
public java.lang.String getActorId();
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.StartWorkOnTaskCommand overwriteSwimlane(boolean);
+ public org.jbpm.command.StartWorkOnTaskCommand taskInstanceId(long);
+ public org.jbpm.command.StartWorkOnTaskCommand actorId(java.lang.String);
}
Compiled from "SuspendProcessInstanceCommand.java"
@@ -538,6 +615,9 @@
public java.util.Map getVariables();
public void setVariables(java.util.Map);
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.TaskInstanceEndCommand taskInstanceId(long);
+ public org.jbpm.command.TaskInstanceEndCommand transitionName(java.lang.String);
+ public org.jbpm.command.TaskInstanceEndCommand variables(java.util.Map);
}
Compiled from "UnlockTokenCommand.java"
@@ -546,7 +626,8 @@
public java.lang.Object execute(org.jbpm.graph.exe.Token);
public java.lang.String getAdditionalToStringInformation();
public java.lang.String getLockOwner();
- public org.jbpm.command.UnlockTokenCommand setLockOwner(java.lang.String);
+ public void setLockOwner(java.lang.String);
+ public org.jbpm.command.UnlockTokenCommand lockOwner(java.lang.String);
}
Compiled from "VariablesCommand.java"
@@ -562,6 +643,9 @@
public java.util.Map getVariables();
public void setVariables(java.util.Map);
public java.lang.String getAdditionalToStringInformation();
+ public org.jbpm.command.VariablesCommand taskInstanceId(long);
+ public org.jbpm.command.VariablesCommand tokenId(long);
+ public org.jbpm.command.VariablesCommand variables(java.util.Map);
}
Compiled from "AbstractObjectInfo.java"
@@ -1249,13 +1333,14 @@
public org.jbpm.db.AbstractDbTestCase();
protected void setUp() throws java.lang.Exception;
protected void tearDown() throws java.lang.Exception;
- public void beginSessionTransaction();
- public void commitAndCloseSession();
+ protected java.lang.String getHibernateDialect();
+ protected void beginSessionTransaction();
+ protected void commitAndCloseSession();
protected void newTransaction();
- public org.jbpm.graph.exe.ProcessInstance saveAndReload(org.jbpm.graph.exe.ProcessInstance);
- public org.jbpm.taskmgmt.exe.TaskInstance saveAndReload(org.jbpm.taskmgmt.exe.TaskInstance);
- public org.jbpm.graph.def.ProcessDefinition saveAndReload(org.jbpm.graph.def.ProcessDefinition);
- public org.jbpm.logging.log.ProcessLog saveAndReload(org.jbpm.logging.log.ProcessLog);
+ protected org.jbpm.graph.exe.ProcessInstance saveAndReload(org.jbpm.graph.exe.ProcessInstance);
+ protected org.jbpm.taskmgmt.exe.TaskInstance saveAndReload(org.jbpm.taskmgmt.exe.TaskInstance);
+ protected org.jbpm.graph.def.ProcessDefinition saveAndReload(org.jbpm.graph.def.ProcessDefinition);
+ protected org.jbpm.logging.log.ProcessLog saveAndReload(org.jbpm.logging.log.ProcessLog);
protected void createSchema();
protected void cleanSchema();
protected void dropSchema();
@@ -1381,12 +1466,16 @@
Compiled from "HibernateHelper.java"
public class org.jbpm.db.hibernate.HibernateHelper extends java.lang.Object{
+ public static void clearConfigurationsCache();
public static org.hibernate.SessionFactory createSessionFactory();
public static org.hibernate.SessionFactory createSessionFactory(java.lang.String);
public static org.hibernate.SessionFactory createSessionFactory(java.lang.String, java.lang.String);
public static org.hibernate.SessionFactory createSessionFactory(java.lang.String, java.lang.String, boolean);
public static org.hibernate.SessionFactory createSessionFactory(org.hibernate.cfg.Configuration, boolean);
public static org.hibernate.cfg.Configuration createConfiguration(java.lang.String, java.lang.String);
+ public static org.hibernate.cfg.Configuration getConfiguration(org.hibernate.SessionFactory);
+ public static org.hibernate.tool.hbm2ddl.SchemaExport createSchemaExport(org.hibernate.SessionFactory);
+ public static boolean createSchemaExportScript(org.hibernate.SessionFactory);
public static void clearHibernateCache(org.hibernate.SessionFactory);
}
@@ -1527,7 +1616,7 @@
}
Compiled from "EventCallback.java"
-class org.jbpm.EventCallback$1 extends java.lang.Object implements javax.transaction.Synchronization{
+final class org.jbpm.EventCallback$1 extends java.lang.Object implements javax.transaction.Synchronization{
public void beforeCompletion();
public void afterCompletion(int);
}
@@ -4337,7 +4426,9 @@
Compiled from "SubjectAuthenticationService.java"
public class org.jbpm.security.authentication.SubjectAuthenticationService extends java.lang.Object implements org.jbpm.security.AuthenticationService{
+ public org.jbpm.security.authentication.SubjectAuthenticationService(java.lang.String, java.lang.Boolean);
public org.jbpm.security.authentication.SubjectAuthenticationService();
+ protected void initPrincipalClass(java.lang.String);
public java.lang.String getActorId();
public void setActorId(java.lang.String);
public void close();
@@ -4348,6 +4439,10 @@
public org.jbpm.security.authentication.SubjectAuthenticationServiceFactory();
public org.jbpm.svc.Service openService();
public void close();
+ public boolean isAllowActorIdOverwrite();
+ public void setAllowActorIdOverwrite(boolean);
+ public java.lang.String getPrincipalClassName();
+ public void setPrincipalClassName(java.lang.String);
}
Compiled from "IdentityAuthorizationService.java"
17 years, 4 months
JBoss JBPM SVN: r3440 - jbpm4/trunk.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-12-19 04:09:49 -0500 (Fri, 19 Dec 2008)
New Revision: 3440
Modified:
jbpm4/trunk/
Log:
added profiles.xml to svn:ignore
Property changes on: jbpm4/trunk
___________________________________________________________________
Name: svn:ignore
- .settings
+ .settings
profiles.xml
17 years, 4 months
JBoss JBPM SVN: r3439 - jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jms.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-19 04:06:20 -0500 (Fri, 19 Dec 2008)
New Revision: 3439
Modified:
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java
Log:
[JBPM-1811] JmsMessageTest fails intermitently on HSQLDB
Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java 2008-12-19 09:06:06 UTC (rev 3438)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java 2008-12-19 09:06:20 UTC (rev 3439)
@@ -52,8 +52,10 @@
*
* @author Alejandro Guizar
*/
-public class JmsMessageTest extends ServletTestCase {
-
+public class JmsMessageTest extends ServletTestCase
+{
+ private static Log log = LogFactory.getLog(JmsMessageTest.class);
+
private LocalCommandService commandService;
private static LocalCommandServiceHome commandServiceHome;
@@ -61,17 +63,22 @@
static final int processExecutionCount = 5;
static final int maxWaitTime = 10 * 1000;
- public static Test suite() throws Exception {
+ public static Test suite() throws Exception
+ {
return new IntegrationTestSetup(JmsMessageTest.class, "enterprise-test.war");
}
- protected void setUp() throws Exception {
- if (commandServiceHome == null) {
+ protected void setUp() throws Exception
+ {
+ if (commandServiceHome == null)
+ {
Context initialContext = new InitialContext();
- try {
- commandServiceHome = (LocalCommandServiceHome) initialContext
- .lookup("java:comp/env/ejb/CommandServiceBean");
- } finally {
+ try
+ {
+ commandServiceHome = (LocalCommandServiceHome)initialContext.lookup("java:comp/env/ejb/CommandServiceBean");
+ }
+ finally
+ {
initialContext.close();
}
}
@@ -79,13 +86,15 @@
log.info("### " + getName() + " started ###");
}
- protected void tearDown() throws Exception {
+ protected void tearDown() throws Exception
+ {
log.info("### " + getName() + " done ###");
commandService = null;
EventCallback.clear();
}
- public void testAsyncNode() {
+ public void testAsyncNode()
+ {
deployProcess("<process-definition name='node'>"
+ " <event type='process-end'>"
+ " <action expression='#{eventCallback.processEnd}'/>"
@@ -98,12 +107,14 @@
+ " </node>"
+ " <end-state name='end' />"
+ "</process-definition>");
+
long processId = launchProcess("node").getId();
EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END);
assertTrue("Process has ended", hasProcessEnded(processId));
}
- public void testAsyncAction() {
+ public void testAsyncAction()
+ {
deployProcess("<process-definition name='action'>"
+ " <start-state name='start'>"
+ " <transition to='a' />"
@@ -121,6 +132,7 @@
+ " </node>"
+ " <end-state name='end' />"
+ "</process-definition>");
+
long processId = launchProcess("action").getId();
EventCallback.waitForEvent(Event.EVENTTYPE_NODE_ENTER);
EventCallback.waitForEvent(Event.EVENTTYPE_NODE_LEAVE);
@@ -128,7 +140,8 @@
assertTrue("Process has ended", hasProcessEnded(processId));
}
- public void testAsyncSequence() {
+ public void testAsyncSequence()
+ {
deployProcess("<process-definition name='sequence'>"
+ " <event type='process-end'>"
+ " <action expression='#{eventCallback.processEnd}'/>"
@@ -153,14 +166,17 @@
+ " </node>"
+ " <end-state name='end' />"
+ "</process-definition>");
+
long processId = launchProcess("sequence").getId();
EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END);
assertTrue("Process has ended", hasProcessEnded(processId));
}
- public void testAsyncFork() throws Exception {
- if (getDialect().indexOf("HSQL") != -1) {
- // [JBPM-1811] JmsMessageTest fails intermittently on HSQLDB
+ public void testAsyncFork() throws Exception
+ {
+ // [JBPM-1811] JmsMessageTest fails intermittently on HSQLDB
+ if (getHibernateDialect().indexOf("HSQL") != -1)
+ {
return;
}
@@ -198,24 +214,29 @@
+ " </join>"
+ " <end-state name='end' />"
+ "</process-definition>");
+
long processId = launchProcess("fork").getId();
EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END);
Thread.sleep(1000);
assertTrue("Process has ended", hasProcessEnded(processId));
}
- private String getDialect() {
- return (String) commandService.execute(new Command() {
+ private String getHibernateDialect()
+ {
+ return (String)commandService.execute(new Command()
+ {
private static final long serialVersionUID = 1L;
- public Object execute(JbpmContext jbpmContext) throws Exception {
- DbPersistenceServiceFactory factory = (DbPersistenceServiceFactory) jbpmContext.getServiceFactory(Services.SERVICENAME_PERSISTENCE);
+ public Object execute(JbpmContext jbpmContext) throws Exception
+ {
+ DbPersistenceServiceFactory factory = (DbPersistenceServiceFactory)jbpmContext.getServiceFactory(Services.SERVICENAME_PERSISTENCE);
return factory.getConfiguration().getProperty(Environment.DIALECT);
- }
+ }
});
}
- public void testAsyncExecutions() {
+ public void testAsyncExecutions()
+ {
deployProcess("<process-definition name='execution'>"
+ " <event type='process-end'>"
+ " <action expression='#{eventCallback.processEnd}' />"
@@ -246,53 +267,63 @@
+ " </node>"
+ " <end-state name='end' />"
+ "</process-definition>");
+
long[] processIds = new long[processExecutionCount];
- for (int i = 0; i < processExecutionCount; i++) {
+ for (int i = 0; i < processExecutionCount; i++)
+ {
processIds[i] = launchProcess("execution").getId();
EventCallback.waitForEvent(Event.EVENTTYPE_NODE_ENTER);
}
- for (int i = 0; i < processExecutionCount; i++) {
+ for (int i = 0; i < processExecutionCount; i++)
+ {
EventCallback.waitForEvent(Event.EVENTTYPE_NODE_LEAVE);
}
- for (int i = 0; i < processExecutionCount; i++) {
+ for (int i = 0; i < processExecutionCount; i++)
+ {
waitForProcessEnd(processIds[i]);
assertTrue(hasProcessEnded(processIds[i]));
}
}
- private ProcessDefinition deployProcess(String xml) {
- return (ProcessDefinition) commandService.execute(new DeployProcessCommand(xml));
+ private ProcessDefinition deployProcess(String xml)
+ {
+ return (ProcessDefinition)commandService.execute(new DeployProcessCommand(xml));
}
- private ProcessInstance launchProcess(String processName) {
+ private ProcessInstance launchProcess(String processName)
+ {
StartProcessInstanceCommand command = new StartProcessInstanceCommand();
command.setProcessDefinitionName(processName);
- command.setVariables(Collections.singletonMap("eventCallback",
- new EventCallback()));
- return (ProcessInstance) commandService.execute(command);
+ command.setVariables(Collections.singletonMap("eventCallback", new EventCallback()));
+ return (ProcessInstance)commandService.execute(command);
}
- private boolean hasProcessEnded(final long processId) {
- Boolean isFinished = (Boolean) commandService.execute(new Command() {
+ private boolean hasProcessEnded(final long processId)
+ {
+ Boolean isFinished = (Boolean)commandService.execute(new Command()
+ {
private static final long serialVersionUID = 1L;
- public Object execute(JbpmContext jbpmContext) throws Exception {
+ public Object execute(JbpmContext jbpmContext) throws Exception
+ {
return jbpmContext.loadProcessInstance(processId).hasEnded();
}
});
return isFinished.booleanValue();
}
- private void waitForProcessEnd(long processId) {
+ private void waitForProcessEnd(long processId)
+ {
long startTime = System.currentTimeMillis();
- do {
+ do
+ {
EventCallback.waitForEvent(Event.EVENTTYPE_PROCESS_END, 1000);
- if (System.currentTimeMillis() - startTime > maxWaitTime) {
+ if (System.currentTimeMillis() - startTime > maxWaitTime)
+ {
log.warn("process " + processId + " took too long");
break;
}
- } while (!hasProcessEnded(processId));
+ }
+ while (!hasProcessEnded(processId));
}
-
- private static Log log = LogFactory.getLog(JmsMessageTest.class);
}
17 years, 4 months
JBoss JBPM SVN: r3438 - in jbpm3/trunk/modules/core: src/main/java/org/jbpm/db and 1 other directory.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-19 04:06:06 -0500 (Fri, 19 Dec 2008)
New Revision: 3438
Modified:
jbpm3/trunk/modules/core/pom.xml
jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java
Log:
[JBPM-1811] JmsMessageTest fails intermitently on HSQLDB
Modified: jbpm3/trunk/modules/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/core/pom.xml 2008-12-19 08:45:04 UTC (rev 3437)
+++ jbpm3/trunk/modules/core/pom.xml 2008-12-19 09:06:06 UTC (rev 3438)
@@ -223,8 +223,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
- <!-- Won't Fix [JBPM-1811] JmsMessageTest fails intermitently on HSQLDB -->
- <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>
<!-- [JBPM-983] concurrent process execution fails -->
<exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude>
<!-- [JBPM-1072] Concurrent JobExecutors can process the same job in parallel -->
@@ -260,8 +258,6 @@
<exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude>
<!-- Won't Fix [JBPM-1072] Concurrent JobExecutors can process the same job in parallel -->
<exclude>org/jbpm/jbpm1072/JBPM1072Test.java</exclude>
- <!-- Won't Fix [JBPM-1811] JmsMessageTest fails intermitently on HSQLDB -->
- <exclude>org/jbpm/msg/jms/JmsMessageTest.java</exclude>
<!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema -->
<exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
</excludes>
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2008-12-19 08:45:04 UTC (rev 3437)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/AbstractDbTestCase.java 2008-12-19 09:06:06 UTC (rev 3438)
@@ -21,6 +21,8 @@
*/
package org.jbpm.db;
+// $Id$
+
import java.util.Iterator;
import java.util.Map;
import java.util.Timer;
@@ -30,6 +32,7 @@
import org.apache.commons.logging.LogFactory;
import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.jbpm.AbstractJbpmTestCase;
import org.jbpm.JbpmConfiguration;
@@ -40,6 +43,7 @@
import org.jbpm.job.executor.JobExecutor;
import org.jbpm.logging.log.ProcessLog;
import org.jbpm.persistence.db.DbPersistenceServiceFactory;
+import org.jbpm.svc.Services;
import org.jbpm.taskmgmt.exe.TaskInstance;
public abstract class AbstractDbTestCase extends AbstractJbpmTestCase
@@ -105,13 +109,19 @@
}
}
- public void beginSessionTransaction()
+ protected String getHibernateDialect()
{
+ DbPersistenceServiceFactory factory = (DbPersistenceServiceFactory)jbpmContext.getServiceFactory(Services.SERVICENAME_PERSISTENCE);
+ return factory.getConfiguration().getProperty(Environment.DIALECT);
+ }
+
+ protected void beginSessionTransaction()
+ {
createJbpmContext();
initializeMembers();
}
- public void commitAndCloseSession()
+ protected void commitAndCloseSession()
{
closeJbpmContext();
resetMembers();
@@ -123,28 +133,28 @@
beginSessionTransaction();
}
- public ProcessInstance saveAndReload(ProcessInstance pi)
+ protected ProcessInstance saveAndReload(ProcessInstance pi)
{
jbpmContext.save(pi);
newTransaction();
return graphSession.loadProcessInstance(pi.getId());
}
- public TaskInstance saveAndReload(TaskInstance taskInstance)
+ protected TaskInstance saveAndReload(TaskInstance taskInstance)
{
jbpmContext.save(taskInstance);
newTransaction();
return (TaskInstance)session.load(TaskInstance.class, new Long(taskInstance.getId()));
}
- public ProcessDefinition saveAndReload(ProcessDefinition pd)
+ protected ProcessDefinition saveAndReload(ProcessDefinition pd)
{
graphSession.saveProcessDefinition(pd);
newTransaction();
return graphSession.loadProcessDefinition(pd.getId());
}
- public ProcessLog saveAndReload(ProcessLog processLog)
+ protected ProcessLog saveAndReload(ProcessLog processLog)
{
loggingSession.saveProcessLog(processLog);
newTransaction();
17 years, 4 months
JBoss JBPM SVN: r3437 - jbpm3/trunk.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-19 03:45:04 -0500 (Fri, 19 Dec 2008)
New Revision: 3437
Modified:
jbpm3/trunk/.project
Log:
Allign project name with artifactId
Modified: jbpm3/trunk/.project
===================================================================
--- jbpm3/trunk/.project 2008-12-19 07:12:23 UTC (rev 3436)
+++ jbpm3/trunk/.project 2008-12-19 08:45:04 UTC (rev 3437)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbpm3</name>
+ <name>jbpm</name>
<comment></comment>
<projects>
</projects>
17 years, 4 months
JBoss JBPM SVN: r3436 - jbpm3/tags/jbpm-3.2.4.GA/hudson.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-12-19 02:12:23 -0500 (Fri, 19 Dec 2008)
New Revision: 3436
Modified:
jbpm3/tags/jbpm-3.2.4.GA/hudson/profiles.xml.local.qa
Log:
Add jdbc.sybase.driver
Modified: jbpm3/tags/jbpm-3.2.4.GA/hudson/profiles.xml.local.qa
===================================================================
--- jbpm3/tags/jbpm-3.2.4.GA/hudson/profiles.xml.local.qa 2008-12-18 21:17:44 UTC (rev 3435)
+++ jbpm3/tags/jbpm-3.2.4.GA/hudson/profiles.xml.local.qa 2008-12-19 07:12:23 UTC (rev 3436)
@@ -19,6 +19,7 @@
<jdbc.mysql.username>jbpmtest</jdbc.mysql.username>
<jdbc.mysql.password></jdbc.mysql.password>
+ <jdbc.sybase.driver>net.sourceforge.jtds.jdbc.Driver</jdbc.sybase.driver>
<jdbc.sybase.url>jdbc:jtds:sybase://192.168.0.101:5000/jbpmtest</jdbc.sybase.url>
<jdbc.sybase.server>192.168.0.101</jdbc.sybase.server>
<jdbc.sybase.port>5000</jdbc.sybase.port>
17 years, 4 months