Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
11774d22
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,发现更多精彩内容 >>
提交
11774d22
编写于
9月 14, 2015
作者:
J
Joram Barrez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixing some typo's + adding a 'createDbSqlSessionFactory' such that subclasses can easily extend
上级
6545434c
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
39 addition
and
22 deletion
+39
-22
modules/activiti-engine/src/main/java/org/activiti/engine/delegate/DelegateExecution.java
.../java/org/activiti/engine/delegate/DelegateExecution.java
+11
-1
modules/activiti-engine/src/main/java/org/activiti/engine/impl/ProcessEngineImpl.java
...main/java/org/activiti/engine/impl/ProcessEngineImpl.java
+1
-1
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cfg/ProcessEngineConfigurationImpl.java
...iviti/engine/impl/cfg/ProcessEngineConfigurationImpl.java
+25
-18
modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/Entity.java
...ine/src/main/java/org/activiti/engine/impl/db/Entity.java
+1
-0
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntity.java
...iviti/engine/impl/persistence/entity/ExecutionEntity.java
+1
-2
未找到文件。
modules/activiti-engine/src/main/java/org/activiti/engine/delegate/DelegateExecution.java
浏览文件 @
11774d22
...
...
@@ -33,10 +33,14 @@ public interface DelegateExecution extends VariableScope {
/** Reference to the overall process instance */
String
getProcessInstanceId
();
/**
* The 'root' process instance. When using call activity for example, the processInstance
* set will not always be the root. This method returns the topmost process instance.
*/
String
getRootProcessInstanceId
();
/**
*
The {@link ExecutionListener#EVENTNAME_START event name} in case this execution is passed in for an {@link ExecutionListener}
*
Will contain the event name in case this execution is passed in for an {@link ExecutionListener}.
*/
String
getEventName
();
...
...
@@ -70,8 +74,14 @@ public interface DelegateExecution extends VariableScope {
*/
String
getTenantId
();
/**
* The BPMN element where the execution currently is at.
*/
FlowElement
getCurrentFlowElement
();
/**
* Change the current BPMN element the execution is at.
*/
void
setCurrentFlowElement
(
FlowElement
flowElement
);
/* Execution management */
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/ProcessEngineImpl.java
浏览文件 @
11774d22
...
...
@@ -74,7 +74,7 @@ public class ProcessEngineImpl implements ProcessEngine {
this
.
sessionFactories
=
processEngineConfiguration
.
getSessionFactories
();
this
.
transactionContextFactory
=
processEngineConfiguration
.
getTransactionContextFactory
();
if
(
processEngineConfiguration
.
isUsingRelationalDatabase
())
{
if
(
processEngineConfiguration
.
isUsingRelationalDatabase
()
&&
processEngineConfiguration
.
getDatabaseSchemaUpdate
()
!=
null
)
{
commandExecutor
.
execute
(
processEngineConfiguration
.
getSchemaCommandConfig
(),
new
SchemaOperationsProcessEngineBuild
());
}
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cfg/ProcessEngineConfigurationImpl.java
浏览文件 @
11774d22
...
...
@@ -902,9 +902,8 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
if
(
sqlSessionFactory
==
null
)
{
InputStream
inputStream
=
null
;
try
{
inputStream
=
getMyBatisXmlConfigurationSteam
();
inputStream
=
getMyBatisXmlConfigurationSt
r
eam
();
// update the jdbc parameters to the configured ones...
Environment
environment
=
new
Environment
(
"default"
,
transactionFactory
,
dataSource
);
Reader
reader
=
new
InputStreamReader
(
inputStream
);
Properties
properties
=
new
Properties
();
...
...
@@ -971,7 +970,7 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
return
ReflectUtil
.
getResourceAsStream
(
resource
);
}
protected
InputStream
getMyBatisXmlConfigurationSteam
()
{
protected
InputStream
getMyBatisXmlConfigurationSt
r
eam
()
{
return
getResourceAsStream
(
DEFAULT_MYBATIS_MAPPING_FILE
);
}
...
...
@@ -1065,21 +1064,7 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
sessionFactories
=
new
HashMap
<
Class
<?>,
SessionFactory
>();
if
(
usingRelationalDatabase
)
{
if
(
dbSqlSessionFactory
==
null
)
{
dbSqlSessionFactory
=
new
DbSqlSessionFactory
();
}
dbSqlSessionFactory
.
setDatabaseType
(
databaseType
);
dbSqlSessionFactory
.
setIdGenerator
(
idGenerator
);
dbSqlSessionFactory
.
setSqlSessionFactory
(
sqlSessionFactory
);
dbSqlSessionFactory
.
setDbIdentityUsed
(
isDbIdentityUsed
);
dbSqlSessionFactory
.
setDbHistoryUsed
(
isDbHistoryUsed
);
dbSqlSessionFactory
.
setDatabaseTablePrefix
(
databaseTablePrefix
);
dbSqlSessionFactory
.
setTablePrefixIsSchema
(
tablePrefixIsSchema
);
dbSqlSessionFactory
.
setDatabaseCatalog
(
databaseCatalog
);
dbSqlSessionFactory
.
setDatabaseSchema
(
databaseSchema
);
dbSqlSessionFactory
.
setBulkInsertEnabled
(
isBulkInsertEnabled
,
databaseType
);
dbSqlSessionFactory
.
setMaxNrOfStatementsInBulkInsert
(
maxNrOfStatementsInBulkInsert
);
addSessionFactory
(
dbSqlSessionFactory
);
initDbSqlSessionFactory
();
}
addSessionFactory
(
new
GenericManagerFactory
(
EntityCache
.
class
,
EntityCacheImpl
.
class
));
...
...
@@ -1092,6 +1077,28 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
}
}
protected
void
initDbSqlSessionFactory
()
{
if
(
dbSqlSessionFactory
==
null
)
{
dbSqlSessionFactory
=
createDbSqlSessionFactory
();
}
dbSqlSessionFactory
.
setDatabaseType
(
databaseType
);
dbSqlSessionFactory
.
setIdGenerator
(
idGenerator
);
dbSqlSessionFactory
.
setSqlSessionFactory
(
sqlSessionFactory
);
dbSqlSessionFactory
.
setDbIdentityUsed
(
isDbIdentityUsed
);
dbSqlSessionFactory
.
setDbHistoryUsed
(
isDbHistoryUsed
);
dbSqlSessionFactory
.
setDatabaseTablePrefix
(
databaseTablePrefix
);
dbSqlSessionFactory
.
setTablePrefixIsSchema
(
tablePrefixIsSchema
);
dbSqlSessionFactory
.
setDatabaseCatalog
(
databaseCatalog
);
dbSqlSessionFactory
.
setDatabaseSchema
(
databaseSchema
);
dbSqlSessionFactory
.
setBulkInsertEnabled
(
isBulkInsertEnabled
,
databaseType
);
dbSqlSessionFactory
.
setMaxNrOfStatementsInBulkInsert
(
maxNrOfStatementsInBulkInsert
);
addSessionFactory
(
dbSqlSessionFactory
);
}
protected
DbSqlSessionFactory
createDbSqlSessionFactory
()
{
return
new
DbSqlSessionFactory
();
}
protected
void
addSessionFactory
(
SessionFactory
sessionFactory
)
{
sessionFactories
.
put
(
sessionFactory
.
getSessionType
(),
sessionFactory
);
}
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/Entity.java
浏览文件 @
11774d22
...
...
@@ -14,6 +14,7 @@ package org.activiti.engine.impl.db;
/**
* @author Tom Baeyens
* @author Joram Barrez
*/
public
interface
Entity
{
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntity.java
浏览文件 @
11774d22
...
...
@@ -17,7 +17,6 @@ import java.util.Date;
import
java.util.List
;
import
org.activiti.engine.delegate.DelegateExecution
;
import
org.activiti.engine.delegate.VariableScope
;
import
org.activiti.engine.impl.db.Entity
;
import
org.activiti.engine.impl.db.HasRevision
;
import
org.activiti.engine.runtime.Execution
;
...
...
@@ -31,7 +30,7 @@ import org.activiti.engine.runtime.ProcessInstance;
* @author Joram Barrez
*/
public
interface
ExecutionEntity
extends
VariableScope
,
DelegateExecution
,
Execution
,
ProcessInstance
,
Entity
,
HasRevision
{
public
interface
ExecutionEntity
extends
DelegateExecution
,
Execution
,
ProcessInstance
,
Entity
,
HasRevision
{
void
setBusinessKey
(
String
businessKey
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录