Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
z_stack
Activiti
提交
621064bd
A
Activiti
项目概览
z_stack
/
Activiti
12 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
Activiti
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
621064bd
编写于
12月 27, 2018
作者:
S
salaboy
提交者:
GitHub
12月 27, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2317 from Activiti/2316-salaboy-spring-config-refactoring
@Configuration classes using base Common config
上级
531ad3c5
ac984380
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
13 deletion
+6
-13
activiti-api-impl/activiti-api-process-runtime-impl/src/main/java/org/conf/activiti/runtime/api/ProcessRuntimeAutoConfiguration.java
...activiti/runtime/api/ProcessRuntimeAutoConfiguration.java
+3
-5
activiti-api-impl/activiti-api-runtime-shared-impl/src/main/java/org/activiti/runtime/api/conf/CommonRuntimeAutoConfiguration.java
...viti/runtime/api/conf/CommonRuntimeAutoConfiguration.java
+0
-2
activiti-api-impl/activiti-api-task-runtime-impl/src/main/java/org/activiti/runtime/api/conf/TaskRuntimeAutoConfiguration.java
...tiviti/runtime/api/conf/TaskRuntimeAutoConfiguration.java
+3
-6
未找到文件。
activiti-api-impl/activiti-api-process-runtime-impl/src/main/java/org/conf/activiti/runtime/api/ProcessRuntimeAutoConfiguration.java
浏览文件 @
621064bd
...
@@ -40,6 +40,7 @@ import org.activiti.core.common.spring.security.policies.ProcessSecurityPolicies
...
@@ -40,6 +40,7 @@ import org.activiti.core.common.spring.security.policies.ProcessSecurityPolicies
import
org.activiti.engine.RepositoryService
;
import
org.activiti.engine.RepositoryService
;
import
org.activiti.engine.RuntimeService
;
import
org.activiti.engine.RuntimeService
;
import
org.activiti.engine.delegate.event.ActivitiEventType
;
import
org.activiti.engine.delegate.event.ActivitiEventType
;
import
org.activiti.runtime.api.conf.CommonRuntimeAutoConfiguration
;
import
org.activiti.runtime.api.conf.impl.ProcessRuntimeConfigurationImpl
;
import
org.activiti.runtime.api.conf.impl.ProcessRuntimeConfigurationImpl
;
import
org.activiti.runtime.api.event.impl.ToAPIProcessCreatedEventConverter
;
import
org.activiti.runtime.api.event.impl.ToAPIProcessCreatedEventConverter
;
import
org.activiti.runtime.api.event.impl.ToAPIProcessStartedEventConverter
;
import
org.activiti.runtime.api.event.impl.ToAPIProcessStartedEventConverter
;
...
@@ -71,11 +72,13 @@ import org.activiti.runtime.api.model.impl.APIVariableInstanceConverter;
...
@@ -71,11 +72,13 @@ import org.activiti.runtime.api.model.impl.APIVariableInstanceConverter;
import
org.activiti.runtime.api.model.impl.ToActivityConverter
;
import
org.activiti.runtime.api.model.impl.ToActivityConverter
;
import
org.springframework.beans.factory.InitializingBean
;
import
org.springframework.beans.factory.InitializingBean
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.AutoConfigureAfter
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
@Configuration
@Configuration
@AutoConfigureAfter
(
CommonRuntimeAutoConfiguration
.
class
)
public
class
ProcessRuntimeAutoConfiguration
{
public
class
ProcessRuntimeAutoConfiguration
{
@Bean
@Bean
...
@@ -121,11 +124,6 @@ public class ProcessRuntimeAutoConfiguration {
...
@@ -121,11 +124,6 @@ public class ProcessRuntimeAutoConfiguration {
return
new
APIProcessInstanceConverter
();
return
new
APIProcessInstanceConverter
();
}
}
@Bean
@ConditionalOnMissingBean
public
APIVariableInstanceConverter
apiVariableInstanceConverter
()
{
return
new
APIVariableInstanceConverter
();
}
@Bean
@Bean
public
ProcessRuntimeConfiguration
processRuntimeConfiguration
(
@Autowired
(
required
=
false
)
List
<
ProcessRuntimeEventListener
<?>>
processRuntimeEventListeners
,
public
ProcessRuntimeConfiguration
processRuntimeConfiguration
(
@Autowired
(
required
=
false
)
List
<
ProcessRuntimeEventListener
<?>>
processRuntimeEventListeners
,
...
...
activiti-api-impl/activiti-api-runtime-shared-impl/src/main/java/org/activiti/runtime/api/conf/CommonRuntimeAutoConfiguration.java
浏览文件 @
621064bd
...
@@ -20,13 +20,11 @@ import java.util.Collections;
...
@@ -20,13 +20,11 @@ import java.util.Collections;
import
java.util.List
;
import
java.util.List
;
import
org.activiti.api.model.shared.event.VariableCreatedEvent
;
import
org.activiti.api.model.shared.event.VariableCreatedEvent
;
import
org.activiti.api.model.shared.event.VariableDeletedEvent
;
import
org.activiti.api.model.shared.event.VariableUpdatedEvent
;
import
org.activiti.api.model.shared.event.VariableUpdatedEvent
;
import
org.activiti.api.runtime.shared.events.VariableEventListener
;
import
org.activiti.api.runtime.shared.events.VariableEventListener
;
import
org.activiti.engine.RuntimeService
;
import
org.activiti.engine.RuntimeService
;
import
org.activiti.engine.delegate.event.ActivitiEventType
;
import
org.activiti.engine.delegate.event.ActivitiEventType
;
import
org.activiti.runtime.api.event.impl.ToVariableCreatedConverter
;
import
org.activiti.runtime.api.event.impl.ToVariableCreatedConverter
;
import
org.activiti.runtime.api.event.impl.ToVariableDeletedConverter
;
import
org.activiti.runtime.api.event.impl.ToVariableUpdatedConverter
;
import
org.activiti.runtime.api.event.impl.ToVariableUpdatedConverter
;
import
org.activiti.runtime.api.event.internal.VariableCreatedListenerDelegate
;
import
org.activiti.runtime.api.event.internal.VariableCreatedListenerDelegate
;
import
org.activiti.runtime.api.event.internal.VariableUpdatedListenerDelegate
;
import
org.activiti.runtime.api.event.internal.VariableUpdatedListenerDelegate
;
...
...
activiti-api-impl/activiti-api-task-runtime-impl/src/main/java/org/activiti/runtime/api/conf/TaskRuntimeAutoConfiguration.java
浏览文件 @
621064bd
...
@@ -71,11 +71,14 @@ import org.activiti.runtime.api.model.impl.APITaskConverter;
...
@@ -71,11 +71,14 @@ import org.activiti.runtime.api.model.impl.APITaskConverter;
import
org.activiti.runtime.api.model.impl.APIVariableInstanceConverter
;
import
org.activiti.runtime.api.model.impl.APIVariableInstanceConverter
;
import
org.springframework.beans.factory.InitializingBean
;
import
org.springframework.beans.factory.InitializingBean
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.AutoConfigureAfter
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Import
;
@Configuration
@Configuration
@AutoConfigureAfter
(
CommonRuntimeAutoConfiguration
.
class
)
public
class
TaskRuntimeAutoConfiguration
{
public
class
TaskRuntimeAutoConfiguration
{
@Bean
@Bean
...
@@ -107,12 +110,6 @@ public class TaskRuntimeAutoConfiguration {
...
@@ -107,12 +110,6 @@ public class TaskRuntimeAutoConfiguration {
);
);
}
}
@Bean
@ConditionalOnMissingBean
public
APIVariableInstanceConverter
apiVariableInstanceConverter
(
APIVariableInstanceConverter
variableInstanceConverter
)
{
return
new
APIVariableInstanceConverter
();
}
@Bean
@Bean
public
TaskRuntimeConfiguration
taskRuntimeConfiguration
(
@Autowired
(
required
=
false
)
List
<
TaskRuntimeEventListener
<?>>
taskRuntimeEventListeners
,
public
TaskRuntimeConfiguration
taskRuntimeConfiguration
(
@Autowired
(
required
=
false
)
List
<
TaskRuntimeEventListener
<?>>
taskRuntimeEventListeners
,
@Autowired
(
required
=
false
)
List
<
VariableEventListener
<?>>
variableEventListeners
)
{
@Autowired
(
required
=
false
)
List
<
VariableEventListener
<?>>
variableEventListeners
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录