Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
61182262
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,发现更多精彩内容 >>
提交
61182262
编写于
8月 13, 2014
作者:
T
Tijs Rademakers
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added delete option to process instance query + move to 5.16.1 version
上级
ee8ca01c
变更
53
隐藏空白更改
内联
并排
Showing
53 changed file
with
146 addition
and
60 deletion
+146
-60
modules/activiti-bpmn-converter/pom.xml
modules/activiti-bpmn-converter/pom.xml
+1
-1
modules/activiti-bpmn-layout/pom.xml
modules/activiti-bpmn-layout/pom.xml
+1
-1
modules/activiti-bpmn-model/pom.xml
modules/activiti-bpmn-model/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-common-rest/pom.xml
modules/activiti-common-rest/pom.xml
+1
-1
modules/activiti-crystalball/pom.xml
modules/activiti-crystalball/pom.xml
+1
-1
modules/activiti-cxf/pom.xml
modules/activiti-cxf/pom.xml
+1
-1
modules/activiti-diagram-rest/pom.xml
modules/activiti-diagram-rest/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/ProcessEngine.java
...gine/src/main/java/org/activiti/engine/ProcessEngine.java
+1
-1
modules/activiti-engine/src/main/java/org/activiti/engine/history/HistoricProcessInstanceQuery.java
...activiti/engine/history/HistoricProcessInstanceQuery.java
+6
-0
modules/activiti-engine/src/main/java/org/activiti/engine/impl/HistoricProcessInstanceQueryImpl.java
...ctiviti/engine/impl/HistoricProcessInstanceQueryImpl.java
+13
-0
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteProcessInstanceCmd.java
...rg/activiti/engine/impl/cmd/DeleteProcessInstanceCmd.java
+6
-1
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/deploy/DeploymentManager.java
...iti/engine/impl/persistence/deploy/DeploymentManager.java
+13
-7
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql
...ces/org/activiti/db/create/activiti.db2.create.engine.sql
+2
-2
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql
...rces/org/activiti/db/create/activiti.h2.create.engine.sql
+2
-2
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql
...s/org/activiti/db/create/activiti.mssql.create.engine.sql
+2
-2
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql
...s/org/activiti/db/create/activiti.mysql.create.engine.sql
+2
-2
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql55.create.engine.sql
...org/activiti/db/create/activiti.mysql55.create.engine.sql
+2
-2
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql
.../org/activiti/db/create/activiti.oracle.create.engine.sql
+2
-2
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql
...rg/activiti/db/create/activiti.postgres.create.engine.sql
+2
-2
modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/HistoricProcessInstance.xml
...rg/activiti/db/mapping/entity/HistoricProcessInstance.xml
+6
-0
modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.516.to.5161.engine.sql
...b/upgrade/activiti.db2.upgradestep.516.to.5161.engine.sql
+1
-0
modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.516.to.5161.engine.sql
...db/upgrade/activiti.h2.upgradestep.516.to.5161.engine.sql
+1
-0
modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mssql.upgradestep.516.to.5161.engine.sql
...upgrade/activiti.mssql.upgradestep.516.to.5161.engine.sql
+1
-0
modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql.upgradestep.516.to.5161.engine.sql
...upgrade/activiti.mysql.upgradestep.516.to.5161.engine.sql
+1
-0
modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql55.upgradestep.516.to.5161.engine.sql
...grade/activiti.mysql55.upgradestep.516.to.5161.engine.sql
+1
-0
modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.oracle.upgradestep.516.to.5161.engine.sql
...pgrade/activiti.oracle.upgradestep.516.to.5161.engine.sql
+1
-0
modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.postgres.upgradestep.516.to.5161.engine.sql
...rade/activiti.postgres.upgradestep.516.to.5161.engine.sql
+1
-0
modules/activiti-engine/src/test/java/org/activiti/engine/test/api/history/HistoryServiceTest.java
.../activiti/engine/test/api/history/HistoryServiceTest.java
+43
-0
modules/activiti-engine/src/test/java/org/activiti/engine/test/api/runtime/RuntimeServiceTest.java
.../activiti/engine/test/api/runtime/RuntimeServiceTest.java
+1
-1
modules/activiti-explorer/pom.xml
modules/activiti-explorer/pom.xml
+1
-1
modules/activiti-image-generator/pom.xml
modules/activiti-image-generator/pom.xml
+1
-1
modules/activiti-json-converter/pom.xml
modules/activiti-json-converter/pom.xml
+1
-1
modules/activiti-ldap/pom.xml
modules/activiti-ldap/pom.xml
+1
-1
modules/activiti-modeler/pom.xml
modules/activiti-modeler/pom.xml
+1
-1
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-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java
.../java/org/activiti/osgi/blueprint/BlueprintBasicTest.java
+5
-5
modules/activiti-process-validation/pom.xml
modules/activiti-process-validation/pom.xml
+1
-1
modules/activiti-rest/pom.xml
modules/activiti-rest/pom.xml
+1
-1
modules/activiti-simple-workflow-alfresco/pom.xml
modules/activiti-simple-workflow-alfresco/pom.xml
+1
-1
modules/activiti-simple-workflow/pom.xml
modules/activiti-simple-workflow/pom.xml
+1
-1
modules/activiti-spring-boot/pom.xml
modules/activiti-spring-boot/pom.xml
+1
-1
modules/activiti-spring/pom.xml
modules/activiti-spring/pom.xml
+1
-1
modules/activiti-webapp-angular/pom.xml
modules/activiti-webapp-angular/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
qa/dbclean/pom.xml
qa/dbclean/pom.xml
+1
-1
qa/upgrade/pom.xml
qa/upgrade/pom.xml
+2
-2
userguide/src/en/index.xml
userguide/src/en/index.xml
+1
-1
未找到文件。
modules/activiti-bpmn-converter/pom.xml
浏览文件 @
61182262
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-bpmn-layout/pom.xml
浏览文件 @
61182262
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<build>
...
...
modules/activiti-bpmn-model/pom.xml
浏览文件 @
61182262
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-camel/pom.xml
浏览文件 @
61182262
...
...
@@ -11,7 +11,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
...
...
modules/activiti-cdi/pom.xml
浏览文件 @
61182262
...
...
@@ -11,7 +11,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
...
...
modules/activiti-common-rest/pom.xml
浏览文件 @
61182262
...
...
@@ -11,7 +11,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-crystalball/pom.xml
浏览文件 @
61182262
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<dependencies>
...
...
modules/activiti-cxf/pom.xml
浏览文件 @
61182262
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-diagram-rest/pom.xml
浏览文件 @
61182262
...
...
@@ -11,7 +11,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-engine/pom.xml
浏览文件 @
61182262
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<dependencies>
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngine.java
浏览文件 @
61182262
...
...
@@ -49,7 +49,7 @@ package org.activiti.engine;
public
interface
ProcessEngine
extends
EngineServices
{
/** the version of the activiti library */
public
static
String
VERSION
=
"5.1
7-SNAPSHOT
"
;
public
static
String
VERSION
=
"5.1
6.1
"
;
/** The name as specified in 'process-engine-name' in
* the activiti.cfg.xml configuration file.
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/history/HistoricProcessInstanceQuery.java
浏览文件 @
61182262
...
...
@@ -61,6 +61,12 @@ public interface HistoricProcessInstanceQuery extends Query<HistoricProcessInsta
/** Only select historic process instance that are not yet finished. */
HistoricProcessInstanceQuery
unfinished
();
/** Only select historic process instances that are deleted. */
HistoricProcessInstanceQuery
deleted
();
/** Only select historic process instance that are not deleted. */
HistoricProcessInstanceQuery
notDeleted
();
/** Only select the historic process instances with which the user with the given id is involved. */
HistoricProcessInstanceQuery
involvedUser
(
String
userId
);
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/HistoricProcessInstanceQueryImpl.java
浏览文件 @
61182262
...
...
@@ -28,6 +28,7 @@ import org.activiti.engine.impl.interceptor.CommandExecutor;
* @author Tom Baeyens
* @author Falko Menge
* @author Bernd Ruecker
* @author Tijs Rademakers
*/
public
class
HistoricProcessInstanceQueryImpl
extends
AbstractVariableQueryImpl
<
HistoricProcessInstanceQuery
,
HistoricProcessInstance
>
implements
HistoricProcessInstanceQuery
{
...
...
@@ -38,6 +39,8 @@ public class HistoricProcessInstanceQueryImpl extends AbstractVariableQueryImpl<
protected
String
deploymentId
;
protected
boolean
finished
=
false
;
protected
boolean
unfinished
=
false
;
protected
boolean
deleted
=
false
;
protected
boolean
notDeleted
=
false
;
protected
String
startedBy
;
protected
String
superProcessInstanceId
;
protected
boolean
excludeSubprocesses
;
...
...
@@ -113,6 +116,16 @@ public class HistoricProcessInstanceQueryImpl extends AbstractVariableQueryImpl<
return
this
;
}
public
HistoricProcessInstanceQuery
deleted
()
{
this
.
deleted
=
true
;
return
this
;
}
public
HistoricProcessInstanceQuery
notDeleted
()
{
this
.
notDeleted
=
true
;
return
this
;
}
public
HistoricProcessInstanceQuery
startedBy
(
String
userId
)
{
this
.
startedBy
=
userId
;
return
this
;
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteProcessInstanceCmd.java
浏览文件 @
61182262
...
...
@@ -34,10 +34,15 @@ public class DeleteProcessInstanceCmd implements Command<Void>, Serializable {
}
public
Void
execute
(
CommandContext
commandContext
)
{
if
(
processInstanceId
==
null
)
{
if
(
processInstanceId
==
null
)
{
throw
new
ActivitiIllegalArgumentException
(
"processInstanceId is null"
);
}
// fill default reason if none provided
if
(
deleteReason
==
null
)
{
deleteReason
=
"ACTIVITI_DELETED"
;
}
commandContext
.
getExecutionEntityManager
()
.
deleteProcessInstance
(
processInstanceId
,
deleteReason
);
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/deploy/DeploymentManager.java
浏览文件 @
61182262
...
...
@@ -55,14 +55,19 @@ public class DeploymentManager {
if
(
processDefinitionId
==
null
)
{
throw
new
ActivitiIllegalArgumentException
(
"Invalid process definition id : null"
);
}
ProcessDefinitionEntity
processDefinition
=
Context
.
getCommandContext
()
.
getProcessDefinitionEntityManager
()
.
findProcessDefinitionById
(
processDefinitionId
);
if
(
processDefinition
==
null
)
{
throw
new
ActivitiObjectNotFoundException
(
"no deployed process definition found with id '"
+
processDefinitionId
+
"'"
,
ProcessDefinition
.
class
);
// first try the cache
ProcessDefinitionEntity
processDefinition
=
processDefinitionCache
.
get
(
processDefinitionId
);
if
(
processDefinition
==
null
)
{
processDefinition
=
Context
.
getCommandContext
()
.
getProcessDefinitionEntityManager
()
.
findProcessDefinitionById
(
processDefinitionId
);
if
(
processDefinition
==
null
)
{
throw
new
ActivitiObjectNotFoundException
(
"no deployed process definition found with id '"
+
processDefinitionId
+
"'"
,
ProcessDefinition
.
class
);
}
processDefinition
=
resolveProcessDefinition
(
processDefinition
);
}
processDefinition
=
resolveProcessDefinition
(
processDefinition
);
return
processDefinition
;
}
...
...
@@ -71,6 +76,7 @@ public class DeploymentManager {
.
getCommandContext
()
.
getProcessDefinitionEntityManager
()
.
findLatestProcessDefinitionByKey
(
processDefinitionKey
);
if
(
processDefinition
==
null
)
{
throw
new
ActivitiObjectNotFoundException
(
"no processes deployed with key '"
+
processDefinitionKey
+
"'"
,
ProcessDefinition
.
class
);
}
...
...
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.db2.create.engine.sql
浏览文件 @
61182262
...
...
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
);
insert
into
ACT_GE_PROPERTY
values
(
'schema.version'
,
'5.1
7-SNAPSHOT
'
,
1
);
values
(
'schema.version'
,
'5.1
6.1
'
,
1
);
insert
into
ACT_GE_PROPERTY
values
(
'schema.history'
,
'create(5.1
7-SNAPSHOT
)'
,
1
);
values
(
'schema.history'
,
'create(5.1
6.1
)'
,
1
);
insert
into
ACT_GE_PROPERTY
values
(
'next.dbid'
,
'1'
,
1
);
...
...
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.h2.create.engine.sql
浏览文件 @
61182262
...
...
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
);
insert
into
ACT_GE_PROPERTY
values
(
'schema.version'
,
'5.1
7-SNAPSHOT
'
,
1
);
values
(
'schema.version'
,
'5.1
6.1
'
,
1
);
insert
into
ACT_GE_PROPERTY
values
(
'schema.history'
,
'create(5.1
7-SNAPSHOT
)'
,
1
);
values
(
'schema.history'
,
'create(5.1
6.1
)'
,
1
);
insert
into
ACT_GE_PROPERTY
values
(
'next.dbid'
,
'1'
,
1
);
...
...
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mssql.create.engine.sql
浏览文件 @
61182262
...
...
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
);
insert
into
ACT_GE_PROPERTY
values
(
'schema.version'
,
'5.1
7-SNAPSHOT
'
,
1
);
values
(
'schema.version'
,
'5.1
6.1
'
,
1
);
insert
into
ACT_GE_PROPERTY
values
(
'schema.history'
,
'create(5.1
7-SNAPSHOT
)'
,
1
);
values
(
'schema.history'
,
'create(5.1
6.1
)'
,
1
);
insert
into
ACT_GE_PROPERTY
values
(
'next.dbid'
,
'1'
,
1
);
...
...
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql.create.engine.sql
浏览文件 @
61182262
...
...
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COLLATE
utf8_bin
;
insert
into
ACT_GE_PROPERTY
values
(
'schema.version'
,
'5.1
7-SNAPSHOT
'
,
1
);
values
(
'schema.version'
,
'5.1
6.1
'
,
1
);
insert
into
ACT_GE_PROPERTY
values
(
'schema.history'
,
'create(5.1
7-SNAPSHOT
)'
,
1
);
values
(
'schema.history'
,
'create(5.1
6.1
)'
,
1
);
insert
into
ACT_GE_PROPERTY
values
(
'next.dbid'
,
'1'
,
1
);
...
...
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.mysql55.create.engine.sql
浏览文件 @
61182262
...
...
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COLLATE
utf8_bin
;
insert
into
ACT_GE_PROPERTY
values
(
'schema.version'
,
'5.1
7-SNAPSHOT
'
,
1
);
values
(
'schema.version'
,
'5.1
6.1
'
,
1
);
insert
into
ACT_GE_PROPERTY
values
(
'schema.history'
,
'create(5.1
7-SNAPSHOT
)'
,
1
);
values
(
'schema.history'
,
'create(5.1
6.1
)'
,
1
);
insert
into
ACT_GE_PROPERTY
values
(
'next.dbid'
,
'1'
,
1
);
...
...
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.oracle.create.engine.sql
浏览文件 @
61182262
...
...
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
);
insert
into
ACT_GE_PROPERTY
values
(
'schema.version'
,
'5.1
7-SNAPSHOT
'
,
1
);
values
(
'schema.version'
,
'5.1
6.1
'
,
1
);
insert
into
ACT_GE_PROPERTY
values
(
'schema.history'
,
'create(5.1
7-SNAPSHOT
)'
,
1
);
values
(
'schema.history'
,
'create(5.1
6.1
)'
,
1
);
insert
into
ACT_GE_PROPERTY
values
(
'next.dbid'
,
'1'
,
1
);
...
...
modules/activiti-engine/src/main/resources/org/activiti/db/create/activiti.postgres.create.engine.sql
浏览文件 @
61182262
...
...
@@ -6,10 +6,10 @@ create table ACT_GE_PROPERTY (
);
insert
into
ACT_GE_PROPERTY
values
(
'schema.version'
,
'5.1
7-SNAPSHOT
'
,
1
);
values
(
'schema.version'
,
'5.1
6.1
'
,
1
);
insert
into
ACT_GE_PROPERTY
values
(
'schema.history'
,
'create(5.1
7-SNAPSHOT
)'
,
1
);
values
(
'schema.history'
,
'create(5.1
6.1
)'
,
1
);
insert
into
ACT_GE_PROPERTY
values
(
'next.dbid'
,
'1'
,
1
);
...
...
modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/HistoricProcessInstance.xml
浏览文件 @
61182262
...
...
@@ -268,6 +268,12 @@
<if
test=
"finished"
>
and RES.END_TIME_ is not NULL
</if>
<if
test=
"notDeleted"
>
and RES.DELETE_REASON_ IS NULL
</if>
<if
test=
"deleted"
>
and RES.DELETE_REASON_ IS NOT NULL
</if>
<if
test=
"involvedUser != null"
>
and (
exists(select LINK.USER_ID_ from ${prefix}ACT_HI_IDENTITYLINK LINK where USER_ID_ = #{involvedUser} and LINK.PROC_INST_ID_ = RES.ID_)
...
...
modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.db2.upgradestep.516.to.5161.engine.sql
0 → 100644
浏览文件 @
61182262
update
ACT_GE_PROPERTY
set
VALUE_
=
'5.16.1'
where
NAME_
=
'schema.version'
;
modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.h2.upgradestep.516.to.5161.engine.sql
0 → 100644
浏览文件 @
61182262
update
ACT_GE_PROPERTY
set
VALUE_
=
'5.16.1'
where
NAME_
=
'schema.version'
;
modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mssql.upgradestep.516.to.5161.engine.sql
0 → 100644
浏览文件 @
61182262
update
ACT_GE_PROPERTY
set
VALUE_
=
'5.16.1'
where
NAME_
=
'schema.version'
;
modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql.upgradestep.516.to.5161.engine.sql
0 → 100644
浏览文件 @
61182262
update
ACT_GE_PROPERTY
set
VALUE_
=
'5.16.1'
where
NAME_
=
'schema.version'
;
modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.mysql55.upgradestep.516.to.5161.engine.sql
0 → 100644
浏览文件 @
61182262
update
ACT_GE_PROPERTY
set
VALUE_
=
'5.16.1'
where
NAME_
=
'schema.version'
;
modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.oracle.upgradestep.516.to.5161.engine.sql
0 → 100644
浏览文件 @
61182262
update
ACT_GE_PROPERTY
set
VALUE_
=
'5.16.1'
where
NAME_
=
'schema.version'
;
modules/activiti-engine/src/main/resources/org/activiti/db/upgrade/activiti.postgres.upgradestep.516.to.5161.engine.sql
0 → 100644
浏览文件 @
61182262
update
ACT_GE_PROPERTY
set
VALUE_
=
'5.16.1'
where
NAME_
=
'schema.version'
;
\ No newline at end of file
modules/activiti-engine/src/test/java/org/activiti/engine/test/api/history/HistoryServiceTest.java
浏览文件 @
61182262
...
...
@@ -203,6 +203,49 @@ public class HistoryServiceTest extends PluggableActivitiTestCase {
}
}
@Deployment
(
resources
=
{
"org/activiti/engine/test/api/oneTaskProcess.bpmn20.xml"
})
public
void
testHistoricProcessInstanceQueryForDelete
()
{
String
processInstanceId
=
runtimeService
.
startProcessInstanceByKey
(
"oneTaskProcess"
).
getId
();
runtimeService
.
deleteProcessInstance
(
processInstanceId
,
null
);
HistoricProcessInstanceQuery
processInstanceQuery
=
historyService
.
createHistoricProcessInstanceQuery
().
processInstanceId
(
processInstanceId
);
assertEquals
(
1
,
processInstanceQuery
.
count
());
HistoricProcessInstance
processInstance
=
processInstanceQuery
.
singleResult
();
assertEquals
(
processInstanceId
,
processInstance
.
getId
());
assertEquals
(
"ACTIVITI_DELETED"
,
processInstance
.
getDeleteReason
());
processInstanceQuery
=
historyService
.
createHistoricProcessInstanceQuery
().
processInstanceId
(
processInstanceId
).
deleted
();
assertEquals
(
1
,
processInstanceQuery
.
count
());
processInstance
=
processInstanceQuery
.
singleResult
();
assertEquals
(
processInstanceId
,
processInstance
.
getId
());
assertEquals
(
"ACTIVITI_DELETED"
,
processInstance
.
getDeleteReason
());
processInstanceQuery
=
historyService
.
createHistoricProcessInstanceQuery
().
processInstanceId
(
processInstanceId
).
notDeleted
();
assertEquals
(
0
,
processInstanceQuery
.
count
());
historyService
.
deleteHistoricProcessInstance
(
processInstanceId
);
processInstanceQuery
=
historyService
.
createHistoricProcessInstanceQuery
().
processInstanceId
(
processInstanceId
);
assertEquals
(
0
,
processInstanceQuery
.
count
());
processInstanceId
=
runtimeService
.
startProcessInstanceByKey
(
"oneTaskProcess"
).
getId
();
runtimeService
.
deleteProcessInstance
(
processInstanceId
,
"custom message"
);
processInstanceQuery
=
historyService
.
createHistoricProcessInstanceQuery
().
processInstanceId
(
processInstanceId
);
assertEquals
(
1
,
processInstanceQuery
.
count
());
processInstance
=
processInstanceQuery
.
singleResult
();
assertEquals
(
processInstanceId
,
processInstance
.
getId
());
assertEquals
(
"custom message"
,
processInstance
.
getDeleteReason
());
processInstanceQuery
=
historyService
.
createHistoricProcessInstanceQuery
().
processInstanceId
(
processInstanceId
).
deleted
();
assertEquals
(
1
,
processInstanceQuery
.
count
());
processInstance
=
processInstanceQuery
.
singleResult
();
assertEquals
(
processInstanceId
,
processInstance
.
getId
());
assertEquals
(
"custom message"
,
processInstance
.
getDeleteReason
());
processInstanceQuery
=
historyService
.
createHistoricProcessInstanceQuery
().
processInstanceId
(
processInstanceId
).
notDeleted
();
assertEquals
(
0
,
processInstanceQuery
.
count
());
}
@Deployment
(
resources
=
{
"org/activiti/engine/test/api/oneTaskProcess.bpmn20.xml"
,
"org/activiti/engine/test/api/runtime/oneTaskProcess2.bpmn20.xml"
})
public
void
testHistoricProcessInstanceQueryByDeploymentId
()
{
org
.
activiti
.
engine
.
repository
.
Deployment
deployment
=
repositoryService
.
createDeploymentQuery
().
singleResult
();
...
...
modules/activiti-engine/src/test/java/org/activiti/engine/test/api/runtime/RuntimeServiceTest.java
浏览文件 @
61182262
...
...
@@ -211,7 +211,7 @@ public class RuntimeServiceTest extends PluggableActivitiTestCase {
.
singleResult
();
assertNotNull
(
historicInstance
);
assert
Null
(
historicInstance
.
getDeleteReason
());
assert
Equals
(
"ACTIVITI_DELETED"
,
historicInstance
.
getDeleteReason
());
}
}
...
...
modules/activiti-explorer/pom.xml
浏览文件 @
61182262
...
...
@@ -11,7 +11,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-image-generator/pom.xml
浏览文件 @
61182262
...
...
@@ -11,7 +11,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-json-converter/pom.xml
浏览文件 @
61182262
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-ldap/pom.xml
浏览文件 @
61182262
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-modeler/pom.xml
浏览文件 @
61182262
...
...
@@ -11,7 +11,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-mule/pom.xml
浏览文件 @
61182262
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-osgi/pom.xml
浏览文件 @
61182262
...
...
@@ -11,7 +11,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<build>
...
...
modules/activiti-osgi/src/test/java/org/activiti/osgi/blueprint/BlueprintBasicTest.java
浏览文件 @
61182262
...
...
@@ -79,11 +79,11 @@ public class BlueprintBasicTest {
@Configuration
public
Option
[]
createConfiguration
()
{
Option
[]
coreBundles
=
options
(
mavenBundle
().
groupId
(
"org.activiti"
).
artifactId
(
"activiti-bpmn-model"
).
version
(
"5.1
7-SNAPSHOT
"
),
mavenBundle
().
groupId
(
"org.activiti"
).
artifactId
(
"activiti-bpmn-converter"
).
version
(
"5.1
7-SNAPSHOT
"
),
mavenBundle
().
groupId
(
"org.activiti"
).
artifactId
(
"activiti-process-validation"
).
version
(
"5.1
7-SNAPSHOT
"
),
mavenBundle
().
groupId
(
"org.activiti"
).
artifactId
(
"activiti-image-generator"
).
version
(
"5.1
7-SNAPSHOT
"
),
mavenBundle
().
groupId
(
"org.activiti"
).
artifactId
(
"activiti-engine"
).
version
(
"5.1
7-SNAPSHOT
"
),
mavenBundle
().
groupId
(
"org.activiti"
).
artifactId
(
"activiti-bpmn-model"
).
version
(
"5.1
6.1
"
),
mavenBundle
().
groupId
(
"org.activiti"
).
artifactId
(
"activiti-bpmn-converter"
).
version
(
"5.1
6.1
"
),
mavenBundle
().
groupId
(
"org.activiti"
).
artifactId
(
"activiti-process-validation"
).
version
(
"5.1
6.1
"
),
mavenBundle
().
groupId
(
"org.activiti"
).
artifactId
(
"activiti-image-generator"
).
version
(
"5.1
6.1
"
),
mavenBundle
().
groupId
(
"org.activiti"
).
artifactId
(
"activiti-engine"
).
version
(
"5.1
6.1
"
),
mavenBundle
().
groupId
(
"org.apache.commons"
).
artifactId
(
"commons-lang3"
).
version
(
"3.3.2"
),
mavenBundle
().
groupId
(
"com.fasterxml.jackson.core"
).
artifactId
(
"jackson-core"
).
version
(
"2.2.3"
),
mavenBundle
().
groupId
(
"com.fasterxml.jackson.core"
).
artifactId
(
"jackson-databind"
).
version
(
"2.2.3"
),
...
...
modules/activiti-process-validation/pom.xml
浏览文件 @
61182262
...
...
@@ -11,7 +11,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-rest/pom.xml
浏览文件 @
61182262
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-simple-workflow-alfresco/pom.xml
浏览文件 @
61182262
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<dependencies>
...
...
modules/activiti-simple-workflow/pom.xml
浏览文件 @
61182262
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-spring-boot/pom.xml
浏览文件 @
61182262
...
...
@@ -8,7 +8,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-spring/pom.xml
浏览文件 @
61182262
...
...
@@ -9,7 +9,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-webapp-angular/pom.xml
浏览文件 @
61182262
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<build>
...
...
modules/activiti-webapp-explorer2/pom.xml
浏览文件 @
61182262
...
...
@@ -11,7 +11,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<properties>
...
...
modules/activiti-webapp-rest2/pom.xml
浏览文件 @
61182262
...
...
@@ -10,7 +10,7 @@
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<build>
...
...
pom.xml
浏览文件 @
61182262
...
...
@@ -14,7 +14,7 @@
</parent>
<packaging>
pom
</packaging>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<spring.framework.version>
4.0.6.RELEASE
</spring.framework.version>
...
...
qa/dbclean/pom.xml
浏览文件 @
61182262
...
...
@@ -8,7 +8,7 @@
<artifactId>
activiti-dbclean
</artifactId>
<packaging>
pom
</packaging>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
<dependencies>
<dependency>
...
...
qa/upgrade/pom.xml
浏览文件 @
61182262
...
...
@@ -6,13 +6,13 @@
<name>
Activiti - Upgrade Fetcher
</name>
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-upgrade-fetcher
</artifactId>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
<parent>
<groupId>
org.activiti
</groupId>
<artifactId>
activiti-root
</artifactId>
<relativePath>
../..
</relativePath>
<version>
5.1
7-SNAPSHOT
</version>
<version>
5.1
6.1
</version>
</parent>
<dependencies>
...
...
userguide/src/en/index.xml
浏览文件 @
61182262
...
...
@@ -23,7 +23,7 @@
<book>
<bookinfo><title>
Activiti 5.1
7-SNAPSHOT
User Guide
</title></bookinfo>
<bookinfo><title>
Activiti 5.1
6.1
User Guide
</title></bookinfo>
<toc
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录