Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
447d5ab3
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,发现更多精彩内容 >>
提交
447d5ab3
编写于
4月 24, 2017
作者:
T
Tijs Rademakers
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'expressionManager5' of
https://github.com/martin-grofcik/flowable-engine
上级
0570670b
8198099b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
2 deletion
+20
-2
modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEngineConfigurationImpl.java
...wable/engine/impl/cfg/ProcessEngineConfigurationImpl.java
+10
-0
modules/flowable5-compatibility/src/main/java/org/flowable/compatibility/DefaultProcessEngineFactory.java
...g/flowable/compatibility/DefaultProcessEngineFactory.java
+10
-2
未找到文件。
modules/flowable-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEngineConfigurationImpl.java
浏览文件 @
447d5ab3
...
...
@@ -819,6 +819,7 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
protected
List
<
Object
>
flowable5CustomDefaultBpmnParseHandlers
;
protected
Set
<
Class
<?>>
flowable5CustomMybatisMappers
;
protected
Set
<
String
>
flowable5CustomMybatisXMLMappers
;
protected
Object
flowable5ExpressionManager
;
// buildProcessEngine
// ///////////////////////////////////////////////////////
...
...
@@ -3640,6 +3641,15 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
return
this
;
}
public
Object
getFlowable5ExpressionManager
()
{
return
flowable5ExpressionManager
;
}
public
ProcessEngineConfigurationImpl
setFlowable5ExpressionManager
(
Object
flowable5ExpressionManager
)
{
this
.
flowable5ExpressionManager
=
flowable5ExpressionManager
;
return
this
;
}
public
Object
getFlowable5ListenerFactory
()
{
return
flowable5ListenerFactory
;
}
...
...
modules/flowable5-compatibility/src/main/java/org/flowable/compatibility/DefaultProcessEngineFactory.java
浏览文件 @
447d5ab3
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
...
...
@@ -24,6 +24,7 @@ import org.activiti.engine.ActivitiException;
import
org.activiti.engine.ProcessEngine
;
import
org.activiti.engine.impl.bpmn.parser.factory.ActivityBehaviorFactory
;
import
org.activiti.engine.impl.bpmn.parser.factory.ListenerFactory
;
import
org.activiti.engine.impl.el.ExpressionManager
;
import
org.activiti.engine.impl.history.HistoryLevel
;
import
org.activiti.engine.parse.BpmnParseHandler
;
import
org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl
;
...
...
@@ -60,6 +61,7 @@ public class DefaultProcessEngineFactory {
copyBeans
(
flowable6Configuration
,
flowable5Configuration
);
copyCaches
(
flowable6Configuration
,
flowable5Configuration
);
copyActivityBehaviorFactory
(
flowable6Configuration
,
flowable5Configuration
);
copyExpressionManager
(
flowable6Configuration
,
flowable5Configuration
);
copyListenerFactory
(
flowable6Configuration
,
flowable5Configuration
);
convertParseHandlers
(
flowable6Configuration
,
flowable5Configuration
);
copyCustomMybatisMappers
(
flowable6Configuration
,
flowable5Configuration
);
...
...
@@ -173,6 +175,12 @@ public class DefaultProcessEngineFactory {
}
}
protected
void
copyExpressionManager
(
ProcessEngineConfigurationImpl
flowable6Configuration
,
org
.
activiti
.
engine
.
impl
.
cfg
.
ProcessEngineConfigurationImpl
flowable5Configuration
)
{
if
(
flowable6Configuration
.
getFlowable5ExpressionManager
()
!=
null
)
{
flowable5Configuration
.
setExpressionManager
((
ExpressionManager
)
flowable6Configuration
.
getFlowable5ExpressionManager
());
}
}
protected
void
copyListenerFactory
(
ProcessEngineConfigurationImpl
flowable6Configuration
,
org
.
activiti
.
engine
.
impl
.
cfg
.
ProcessEngineConfigurationImpl
flowable5Configuration
)
{
if
(
flowable6Configuration
.
getFlowable5ListenerFactory
()
!=
null
)
{
flowable5Configuration
.
setListenerFactory
((
ListenerFactory
)
flowable6Configuration
.
getFlowable5ListenerFactory
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录