Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
b474ce29
F
Flowable Engine
项目概览
开发团队
/
Flowable Engine
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Flowable Engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b474ce29
编写于
3月 21, 2012
作者:
T
trademak
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Upgraded to 5.10-SNAPSHOT and applied patch ACT-1156 thanks Capacia
上级
5a65bbe6
变更
16
显示空白变更内容
内联
并排
Showing
16 changed file
with
118 addition
and
13 deletion
+118
-13
modules/activiti-cactus/pom.xml
modules/activiti-cactus/pom.xml
+1
-1
modules/activiti-camel/pom.xml
modules/activiti-camel/pom.xml
+1
-1
modules/activiti-cdi/pom.xml
modules/activiti-cdi/pom.xml
+1
-1
modules/activiti-cxf/pom.xml
modules/activiti-cxf/pom.xml
+1
-1
modules/activiti-engine/pom.xml
modules/activiti-engine/pom.xml
+1
-1
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/CallActivityBehavior.java
...iviti/engine/impl/bpmn/behavior/CallActivityBehavior.java
+1
-1
modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/callactivity/CallActivityAdvancedTest.java
...gine/test/bpmn/callactivity/CallActivityAdvancedTest.java
+59
-0
modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/callactivity/CallActivity.testCallSequentialSubProcess.bpmn20.xml
...vity/CallActivity.testCallSequentialSubProcess.bpmn20.xml
+25
-0
modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/callactivity/simpleSubProcess2.bpmn20.xml
...ngine/test/bpmn/callactivity/simpleSubProcess2.bpmn20.xml
+21
-0
modules/activiti-mule/pom.xml
modules/activiti-mule/pom.xml
+1
-1
modules/activiti-osgi/pom.xml
modules/activiti-osgi/pom.xml
+1
-1
modules/activiti-spring/pom.xml
modules/activiti-spring/pom.xml
+1
-1
modules/activiti-upgrade/pom.xml
modules/activiti-upgrade/pom.xml
+1
-1
modules/activiti-webapp-explorer2/pom.xml
modules/activiti-webapp-explorer2/pom.xml
+1
-1
modules/activiti-webapp-rest2/pom.xml
modules/activiti-webapp-rest2/pom.xml
+1
-1
pom.xml
pom.xml
+1
-1
未找到文件。
modules/activiti-cactus/pom.xml
浏览文件 @
b474ce29
...
...
@@ -12,7 +12,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.
9
-SNAPSHOT
</version>
<version>
5.
10
-SNAPSHOT
</version>
</parent>
<dependencies>
...
...
modules/activiti-camel/pom.xml
浏览文件 @
b474ce29
...
...
@@ -12,7 +12,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.
9
-SNAPSHOT
</version>
<version>
5.
10
-SNAPSHOT
</version>
</parent>
...
...
modules/activiti-cdi/pom.xml
浏览文件 @
b474ce29
...
...
@@ -12,7 +12,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.
9
-SNAPSHOT
</version>
<version>
5.
10
-SNAPSHOT
</version>
</parent>
<dependencies>
...
...
modules/activiti-cxf/pom.xml
浏览文件 @
b474ce29
...
...
@@ -11,7 +11,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.
9
-SNAPSHOT
</version>
<version>
5.
10
-SNAPSHOT
</version>
</parent>
...
...
modules/activiti-engine/pom.xml
浏览文件 @
b474ce29
...
...
@@ -11,7 +11,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.
9
-SNAPSHOT
</version>
<version>
5.
10
-SNAPSHOT
</version>
</parent>
<dependencies>
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/CallActivityBehavior.java
浏览文件 @
b474ce29
...
...
@@ -58,7 +58,7 @@ public class CallActivityBehavior extends AbstractBpmnActivityBehavior implement
public
void
execute
(
ActivityExecution
execution
)
throws
Exception
{
if
(
(
processDefinitonKey
==
null
)
&&
(
processDefinitionExpression
!=
null
)
)
{
if
(
processDefinitionExpression
!=
null
)
{
processDefinitonKey
=
(
String
)
processDefinitionExpression
.
getValue
(
execution
);
}
...
...
modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/callactivity/CallActivityAdvancedTest.java
浏览文件 @
b474ce29
...
...
@@ -139,6 +139,65 @@ public class CallActivityAdvancedTest extends PluggableActivitiTestCase {
assertEquals
(
0
,
runtimeService
.
createExecutionQuery
().
count
());
}
@Deployment
(
resources
=
{
"org/activiti/engine/test/bpmn/callactivity/CallActivity.testCallSequentialSubProcess.bpmn20.xml"
,
"org/activiti/engine/test/bpmn/callactivity/CallActivity.testCallSimpleSubProcessWithExpressions.bpmn20.xml"
,
"org/activiti/engine/test/bpmn/callactivity/simpleSubProcess.bpmn20.xml"
,
"org/activiti/engine/test/bpmn/callactivity/simpleSubProcess2.bpmn20.xml"
})
public
void
testCallSequentialSubProcessWithExpressions
()
{
ProcessInstance
processInstance
=
runtimeService
.
startProcessInstanceByKey
(
"callSequentialSubProcess"
);
// FIRST sub process calls simpleSubProcess
// one task in the subprocess should be active after starting the process
// instance
TaskQuery
taskQuery
=
taskService
.
createTaskQuery
();
Task
taskBeforeSubProcess
=
taskQuery
.
singleResult
();
assertEquals
(
"Task before subprocess"
,
taskBeforeSubProcess
.
getName
());
// Completing the task continues the process which leads to calling the
// subprocess. The sub process we want to call is passed in as a variable
// into this task
taskService
.
setVariable
(
taskBeforeSubProcess
.
getId
(),
"simpleSubProcessExpression"
,
"simpleSubProcess"
);
taskService
.
complete
(
taskBeforeSubProcess
.
getId
());
Task
taskInSubProcess
=
taskQuery
.
singleResult
();
assertEquals
(
"Task in subprocess"
,
taskInSubProcess
.
getName
());
// Completing the task in the subprocess, finishes the subprocess
taskService
.
complete
(
taskInSubProcess
.
getId
());
Task
taskAfterSubProcess
=
taskQuery
.
singleResult
();
assertEquals
(
"Task after subprocess"
,
taskAfterSubProcess
.
getName
());
// Completing this task end the process instance
taskService
.
complete
(
taskAfterSubProcess
.
getId
());
// SECOND sub process calls simpleSubProcess2
// one task in the subprocess should be active after starting the process
// instance
taskQuery
=
taskService
.
createTaskQuery
();
taskBeforeSubProcess
=
taskQuery
.
singleResult
();
assertEquals
(
"Task before subprocess"
,
taskBeforeSubProcess
.
getName
());
// Completing the task continues the process which leads to calling the
// subprocess. The sub process we want to call is passed in as a variable
// into this task
taskService
.
setVariable
(
taskBeforeSubProcess
.
getId
(),
"simpleSubProcessExpression"
,
"simpleSubProcess2"
);
taskService
.
complete
(
taskBeforeSubProcess
.
getId
());
taskInSubProcess
=
taskQuery
.
singleResult
();
assertEquals
(
"Task in subprocess 2"
,
taskInSubProcess
.
getName
());
// Completing the task in the subprocess, finishes the subprocess
taskService
.
complete
(
taskInSubProcess
.
getId
());
taskAfterSubProcess
=
taskQuery
.
singleResult
();
assertEquals
(
"Task after subprocess"
,
taskAfterSubProcess
.
getName
());
// Completing this task end the process instance
taskService
.
complete
(
taskAfterSubProcess
.
getId
());
assertProcessEnded
(
processInstance
.
getId
());
}
@Deployment
(
resources
=
{
"org/activiti/engine/test/bpmn/callactivity/CallActivity.testTimerOnCallActivity.bpmn20.xml"
,
"org/activiti/engine/test/bpmn/callactivity/simpleSubProcess.bpmn20.xml"
})
...
...
modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/callactivity/CallActivity.testCallSequentialSubProcess.bpmn20.xml
0 → 100644
浏览文件 @
b474ce29
<?xml version="1.0" encoding="UTF-8"?>
<definitions
id=
"definitions"
xmlns=
"http://www.omg.org/spec/BPMN/20100524/MODEL"
xmlns:activiti=
"http://activiti.org/bpmn"
targetNamespace=
"Examples"
>
<process
id=
"callSequentialSubProcess"
>
<startEvent
id=
"theStart"
/>
<sequenceFlow
id=
"flow1"
sourceRef=
"theStart"
targetRef=
"callSubProcess"
/>
<callActivity
id=
"callSubProcess"
name=
""
calledElement=
"callSimpleSubProcess"
>
<multiInstanceLoopCharacteristics
isSequential=
"true"
>
<loopCardinality>
2
</loopCardinality>
</multiInstanceLoopCharacteristics>
</callActivity>
<sequenceFlow
id=
"flow3"
sourceRef=
"callSubProcess"
targetRef=
"theEnd"
/>
<endEvent
id=
"theEnd"
/>
</process>
</definitions>
modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/callactivity/simpleSubProcess2.bpmn20.xml
0 → 100644
浏览文件 @
b474ce29
<?xml version="1.0" encoding="UTF-8"?>
<definitions
id=
"definitions"
xmlns=
"http://www.omg.org/spec/BPMN/20100524/MODEL"
xmlns:activiti=
"http://activiti.org/bpmn"
targetNamespace=
"Examples"
>
<process
id=
"simpleSubProcess2"
>
<startEvent
id=
"theStart"
/>
<sequenceFlow
id=
"flow1"
sourceRef=
"theStart"
targetRef=
"task"
/>
<userTask
id=
"task"
name=
"Task in subprocess 2"
/>
<sequenceFlow
id=
"flow2"
sourceRef=
"task"
targetRef=
"theEnd"
/>
<endEvent
id=
"theEnd"
/>
</process>
</definitions>
\ No newline at end of file
modules/activiti-mule/pom.xml
浏览文件 @
b474ce29
...
...
@@ -11,7 +11,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.
9
-SNAPSHOT
</version>
<version>
5.
10
-SNAPSHOT
</version>
</parent>
...
...
modules/activiti-osgi/pom.xml
浏览文件 @
b474ce29
...
...
@@ -12,7 +12,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.
9
-SNAPSHOT
</version>
<version>
5.
10
-SNAPSHOT
</version>
</parent>
<build>
...
...
modules/activiti-spring/pom.xml
浏览文件 @
b474ce29
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.
9
-SNAPSHOT
</version>
<version>
5.
10
-SNAPSHOT
</version>
</parent>
<dependencies>
...
...
modules/activiti-upgrade/pom.xml
浏览文件 @
b474ce29
...
...
@@ -6,7 +6,7 @@
<name>
Activiti - Upgrade
</name>
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-upgrade
</artifactId>
<version>
5.
9
-ALWAYS-SNAPSHOT
</version>
<version>
5.
10
-ALWAYS-SNAPSHOT
</version>
<properties>
<skipTests>
true
</skipTests>
...
...
modules/activiti-webapp-explorer2/pom.xml
浏览文件 @
b474ce29
...
...
@@ -12,7 +12,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.
9
-SNAPSHOT
</version>
<version>
5.
10
-SNAPSHOT
</version>
</parent>
<properties>
...
...
modules/activiti-webapp-rest2/pom.xml
浏览文件 @
b474ce29
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.
9
-SNAPSHOT
</version>
<version>
5.
10
-SNAPSHOT
</version>
</parent>
<build>
...
...
pom.xml
浏览文件 @
b474ce29
...
...
@@ -8,7 +8,7 @@
<artifactId>
activiti-root
</artifactId>
<packaging>
pom
</packaging>
<version>
5.
9
-SNAPSHOT
</version>
<version>
5.
10
-SNAPSHOT
</version>
<properties>
<spring.framework.version>
3.0.3.RELEASE
</spring.framework.version>
<mule.version>
3.1.0
</mule.version>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录