Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
76e6cc7e
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,发现更多精彩内容 >>
提交
76e6cc7e
编写于
2月 28, 2012
作者:
B
bernd.ruecker
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ACT-1113: removed cycle from distro/test.install and removed ProcessEngineConfiguration properties
上级
cd9d9a83
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
2 addition
and
159 deletion
+2
-159
distro/src/setup/build.properties
distro/src/setup/build.properties
+0
-3
distro/src/setup/build.xml
distro/src/setup/build.xml
+1
-11
distro/src/setup/files/cfg.activiti/standalone/activiti.cfg.xml
.../src/setup/files/cfg.activiti/standalone/activiti.cfg.xml
+0
-2
distro/src/setup/files/cfg.cycle/cycle.properties
distro/src/setup/files/cfg.cycle/cycle.properties
+0
-6
distro/src/setup/files/demo/h2.data.sql
distro/src/setup/files/demo/h2.data.sql
+1
-86
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cfg/ProcessEngineConfigurationImpl.java
...iviti/engine/impl/cfg/ProcessEngineConfigurationImpl.java
+0
-15
modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbSqlSession.java
...c/main/java/org/activiti/engine/impl/db/DbSqlSession.java
+0
-26
modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbSqlSessionFactory.java
...java/org/activiti/engine/impl/db/DbSqlSessionFactory.java
+0
-10
未找到文件。
distro/src/setup/build.properties
浏览文件 @
76e6cc7e
...
@@ -13,8 +13,5 @@ tomcat.version=6.0.32
...
@@ -13,8 +13,5 @@ tomcat.version=6.0.32
# downloaded there.
# downloaded there.
downloads.dir
=
../../downloads
downloads.dir
=
../../downloads
# Remove this property or set it to disabled if you're not using Activiti Cycle
feature.cycle
=
enabled
# Remove this property or set it to disabled if you're not using Activiti Modeler
# Remove this property or set it to disabled if you're not using Activiti Modeler
feature.modeler
=
enabled
feature.modeler
=
enabled
\ No newline at end of file
distro/src/setup/build.xml
浏览文件 @
76e6cc7e
...
@@ -12,7 +12,6 @@
...
@@ -12,7 +12,6 @@
<property
name=
"activiti.version"
value=
"5.9-SNAPSHOT"
/>
<property
name=
"activiti.version"
value=
"5.9-SNAPSHOT"
/>
<property
name=
"tomcat.url"
value=
"http://activiti.org/downloads/"
/>
<property
name=
"tomcat.url"
value=
"http://activiti.org/downloads/"
/>
<property
name=
"cycle.workspace"
location=
"${activiti.home}/workspace/activiti-cycle-examples"
/>
<property
name=
"activiti.modeler.base.url"
value=
"http://localhost:8080/activiti-modeler/"
/>
<property
name=
"activiti.modeler.base.url"
value=
"http://localhost:8080/activiti-modeler/"
/>
<!-- ### OS PROPERTIES #################################################################### -->
<!-- ### OS PROPERTIES #################################################################### -->
...
@@ -28,11 +27,7 @@
...
@@ -28,11 +27,7 @@
</condition>
</condition>
<!-- ### DEMO SETUP OPTIONAL FEATURES #################################################################### -->
<!-- ### DEMO SETUP OPTIONAL FEATURES #################################################################### -->
<condition
property=
"cycle.is.enabled"
>
<equals
arg1=
"${feature.cycle}"
arg2=
"enabled"
/>
</condition>
<condition
property=
"modeler.is.enabled"
>
<condition
property=
"modeler.is.enabled"
>
<equals
arg1=
"${feature.modeler}"
arg2=
"enabled"
/>
<equals
arg1=
"${feature.modeler}"
arg2=
"enabled"
/>
</condition>
</condition>
...
@@ -161,11 +156,6 @@
...
@@ -161,11 +156,6 @@
<mkdir
dir=
"build/demo"
/>
<mkdir
dir=
"build/demo"
/>
<copy
file=
"files/demo/${db}.data.sql"
todir=
"build/demo"
/>
<copy
file=
"files/demo/${db}.data.sql"
todir=
"build/demo"
/>
<!-- replace some properties currently needed/used for cycle config -->
<replace
file=
"build/demo/${db}.data.sql"
>
<replacefilter
token=
"@activiti.modeler.base.url@"
value=
"${activiti.modeler.base.url}"
/>
<replacefilter
token=
"@cycle.base.file.path@"
value=
"${cycle.workspace}"
/>
</replace>
<sql
driver=
"${jdbc.driver}"
<sql
driver=
"${jdbc.driver}"
password=
"${jdbc.password}"
password=
"${jdbc.password}"
url=
"${jdbc.url}"
url=
"${jdbc.url}"
...
...
distro/src/setup/files/cfg.activiti/standalone/activiti.cfg.xml
浏览文件 @
76e6cc7e
...
@@ -15,8 +15,6 @@
...
@@ -15,8 +15,6 @@
<property
name=
"jobExecutorActivate"
value=
"true"
/>
<property
name=
"jobExecutorActivate"
value=
"true"
/>
<property
name=
"dbCycleUsed"
value=
"true"
/>
</bean>
</bean>
</beans>
</beans>
distro/src/setup/files/cfg.cycle/cycle.properties
已删除
100644 → 0
浏览文件 @
cd9d9a83
activiti.modeler.base.url
=
http://localhost:8080/activiti-modeler/
database
=
@db@
jdbc.driver
=
@jdbc.driver@
jdbc.url
=
@jdbc.url@
jdbc.username
=
@jdbc.username@
jdbc.password
=
@jdbc.password@
distro/src/setup/files/demo/h2.data.sql
浏览文件 @
76e6cc7e
...
@@ -26,89 +26,4 @@ insert into ACT_ID_MEMBERSHIP values ('gonzo', 'sales');
...
@@ -26,89 +26,4 @@ insert into ACT_ID_MEMBERSHIP values ('gonzo', 'sales');
update
ACT_GE_PROPERTY
update
ACT_GE_PROPERTY
set
VALUE_
=
'10'
set
VALUE_
=
'10'
where
NAME_
=
'next.dbid'
;
where
NAME_
=
'next.dbid'
;
\ No newline at end of file
insert
into
ACT_CY_CONN_CONFIG
values
(
'1'
,
'org.activiti.cycle.impl.connector.fs.FileSystemConnector'
,
'Eclipse Workspace (File System)'
,
'Workspace'
,
'kermit'
,
''
,
'<map><entry><string>basePath</string><string>@cycle.base.file.path@</string></entry></map>'
);
insert
into
ACT_CY_CONN_CONFIG
values
(
'2'
,
'org.activiti.cycle.impl.connector.signavio.SignavioConnector'
,
'Activiti Modeler'
,
'Activiti'
,
'kermit'
,
''
,
'<map>
<entry><string>signavioBaseUrl</string><string>@activiti.modeler.base.url@</string></entry>
<entry><string>loginRequired</string><boolean>false</boolean></entry>
</map>'
);
insert
into
ACT_CY_CONN_CONFIG
values
(
'3'
,
'org.activiti.cycle.impl.connector.fs.FileSystemConnector'
,
'Eclipse Workspace (File System)'
,
'Workspace'
,
'fozzie'
,
''
,
'<map><entry><string>basePath</string><string>@cycle.base.file.path@</string></entry></map>'
);
insert
into
ACT_CY_CONN_CONFIG
values
(
'4'
,
'org.activiti.cycle.impl.connector.signavio.SignavioConnector'
,
'Activiti Modeler'
,
'Activiti'
,
'fozzie'
,
''
,
'<map>
<entry><string>signavioBaseUrl</string><string>@activiti.modeler.base.url@</string></entry>
<entry><string>loginRequired</string><boolean>false</boolean></entry>
</map>'
);
insert
into
ACT_CY_CONN_CONFIG
values
(
'5'
,
'org.activiti.cycle.impl.connector.fs.FileSystemConnector'
,
'Eclipse Workspace (File System)'
,
'Workspace'
,
'gonzo'
,
''
,
'<map><entry><string>basePath</string><string>@cycle.base.file.path@</string></entry></map>'
);
insert
into
ACT_CY_CONN_CONFIG
values
(
'6'
,
'org.activiti.cycle.impl.connector.signavio.SignavioConnector'
,
'Activiti Modeler'
,
'Activiti'
,
'gonzo'
,
''
,
'<map>
<entry><string>signavioBaseUrl</string><string>@activiti.modeler.base.url@</string></entry>
<entry><string>loginRequired</string><boolean>false</boolean></entry>
</map>'
);
insert
into
ACT_CY_CONFIG
values
(
'1'
,
'processSolutionTemplates'
,
'default'
,
'<processSolutionTemplate>
<vFolder type="Management" name="Management" connectorId="Workspace" referencedNodeId="/" />
<vFolder type="Processes" name="Processes" connectorId="Activiti" referencedNodeId="/root-directory" />
<vFolder type="Requirements" name="Requirements" connectorId="Workspace" referencedNodeId="/" />
<vFolder type="Implementation" name="Implementation" connectorId="Workspace" referencedNodeId="/" />
</processSolutionTemplate>'
);
insert
into
ACT_CY_PROCESS_SOLUTION
values
(
'ps1'
,
'Easy Bugfiling Process'
,
'IN_SPECIFICATION'
);
insert
into
ACT_CY_V_FOLDER
values
(
'ps1Management'
,
'Management'
,
'Workspace'
,
'/EasyBugFilingProcess/Management'
,
'ps1'
,
'Management'
);
insert
into
ACT_CY_V_FOLDER
values
(
'ps1Requirements'
,
'Requirements'
,
'Workspace'
,
'/EasyBugFilingProcess/Requirements'
,
'ps1'
,
'Requirements'
);
insert
into
ACT_CY_V_FOLDER
values
(
'ps1Implementation'
,
'Implementation'
,
'Workspace'
,
'/EasyBugFilingProcess/Implementation'
,
'ps1'
,
'Implementation'
);
\ No newline at end of file
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cfg/ProcessEngineConfigurationImpl.java
浏览文件 @
76e6cc7e
...
@@ -266,7 +266,6 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
...
@@ -266,7 +266,6 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
protected
boolean
isDbIdentityUsed
=
true
;
protected
boolean
isDbIdentityUsed
=
true
;
protected
boolean
isDbHistoryUsed
=
true
;
protected
boolean
isDbHistoryUsed
=
true
;
protected
boolean
isDbCycleUsed
=
false
;
protected
DelegateInterceptor
delegateInterceptor
;
protected
DelegateInterceptor
delegateInterceptor
;
...
@@ -559,7 +558,6 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
...
@@ -559,7 +558,6 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
dbSqlSessionFactory
.
setSqlSessionFactory
(
sqlSessionFactory
);
dbSqlSessionFactory
.
setSqlSessionFactory
(
sqlSessionFactory
);
dbSqlSessionFactory
.
setDbIdentityUsed
(
isDbIdentityUsed
);
dbSqlSessionFactory
.
setDbIdentityUsed
(
isDbIdentityUsed
);
dbSqlSessionFactory
.
setDbHistoryUsed
(
isDbHistoryUsed
);
dbSqlSessionFactory
.
setDbHistoryUsed
(
isDbHistoryUsed
);
dbSqlSessionFactory
.
setDbCycleUsed
(
isDbCycleUsed
);
addSessionFactory
(
dbSqlSessionFactory
);
addSessionFactory
(
dbSqlSessionFactory
);
addSessionFactory
(
new
GenericManagerFactory
(
AttachmentManager
.
class
));
addSessionFactory
(
new
GenericManagerFactory
(
AttachmentManager
.
class
));
...
@@ -1506,27 +1504,14 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
...
@@ -1506,27 +1504,14 @@ public abstract class ProcessEngineConfigurationImpl extends ProcessEngineConfig
public
boolean
isDbHistoryUsed
()
{
public
boolean
isDbHistoryUsed
()
{
return
isDbHistoryUsed
;
return
isDbHistoryUsed
;
}
}
public
void
setDbHistoryUsed
(
boolean
isDbHistoryUsed
)
{
public
void
setDbHistoryUsed
(
boolean
isDbHistoryUsed
)
{
this
.
isDbHistoryUsed
=
isDbHistoryUsed
;
this
.
isDbHistoryUsed
=
isDbHistoryUsed
;
}
}
public
boolean
isDbCycleUsed
()
{
return
isDbCycleUsed
;
}
public
void
setDbCycleUsed
(
boolean
isDbCycleUsed
)
{
this
.
isDbCycleUsed
=
isDbCycleUsed
;
}
public
List
<
ResolverFactory
>
getResolverFactories
()
{
public
List
<
ResolverFactory
>
getResolverFactories
()
{
return
resolverFactories
;
return
resolverFactories
;
}
}
public
void
setResolverFactories
(
List
<
ResolverFactory
>
resolverFactories
)
{
public
void
setResolverFactories
(
List
<
ResolverFactory
>
resolverFactories
)
{
this
.
resolverFactories
=
resolverFactories
;
this
.
resolverFactories
=
resolverFactories
;
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbSqlSession.java
浏览文件 @
76e6cc7e
...
@@ -502,9 +502,6 @@ public class DbSqlSession implements Session {
...
@@ -502,9 +502,6 @@ public class DbSqlSession implements Session {
if
(
dbSqlSessionFactory
.
isDbIdentityUsed
()
&&
!
isIdentityTablePresent
())
{
if
(
dbSqlSessionFactory
.
isDbIdentityUsed
()
&&
!
isIdentityTablePresent
())
{
errorMessage
=
addMissingComponent
(
errorMessage
,
"identity"
);
errorMessage
=
addMissingComponent
(
errorMessage
,
"identity"
);
}
}
if
(
dbSqlSessionFactory
.
isDbCycleUsed
()
&&
!
isCycleTablePresent
())
{
errorMessage
=
addMissingComponent
(
errorMessage
,
"cycle"
);
}
Integer
configuredHistoryLevel
=
Context
.
getProcessEngineConfiguration
().
getHistoryLevel
();
Integer
configuredHistoryLevel
=
Context
.
getProcessEngineConfiguration
().
getHistoryLevel
();
PropertyEntity
historyLevelProperty
=
selectById
(
PropertyEntity
.
class
,
"historyLevel"
);
PropertyEntity
historyLevelProperty
=
selectById
(
PropertyEntity
.
class
,
"historyLevel"
);
...
@@ -580,13 +577,6 @@ public class DbSqlSession implements Session {
...
@@ -580,13 +577,6 @@ public class DbSqlSession implements Session {
if
(
processEngineConfiguration
.
isDbIdentityUsed
())
{
if
(
processEngineConfiguration
.
isDbIdentityUsed
())
{
dbSchemaCreateIdentity
();
dbSchemaCreateIdentity
();
}
}
if
(
processEngineConfiguration
.
isDbCycleUsed
())
{
dbSchemaCreateCycle
();
}
}
protected
void
dbSchemaCreateCycle
()
{
executeMandatorySchemaResource
(
"create"
,
"cycle"
);
}
}
protected
void
dbSchemaCreateIdentity
()
{
protected
void
dbSchemaCreateIdentity
()
{
...
@@ -613,9 +603,6 @@ public class DbSqlSession implements Session {
...
@@ -613,9 +603,6 @@ public class DbSqlSession implements Session {
if
(
dbSqlSessionFactory
.
isDbIdentityUsed
())
{
if
(
dbSqlSessionFactory
.
isDbIdentityUsed
())
{
executeMandatorySchemaResource
(
"drop"
,
"identity"
);
executeMandatorySchemaResource
(
"drop"
,
"identity"
);
}
}
if
(
dbSqlSessionFactory
.
isDbCycleUsed
())
{
executeMandatorySchemaResource
(
"drop"
,
"cycle"
);
}
}
}
public
void
dbSchemaPrune
()
{
public
void
dbSchemaPrune
()
{
...
@@ -625,9 +612,6 @@ public class DbSqlSession implements Session {
...
@@ -625,9 +612,6 @@ public class DbSqlSession implements Session {
if
(
isIdentityTablePresent
()
&&
dbSqlSessionFactory
.
isDbIdentityUsed
())
{
if
(
isIdentityTablePresent
()
&&
dbSqlSessionFactory
.
isDbIdentityUsed
())
{
executeMandatorySchemaResource
(
"drop"
,
"identity"
);
executeMandatorySchemaResource
(
"drop"
,
"identity"
);
}
}
if
(
isCycleTablePresent
()
&&
dbSqlSessionFactory
.
isDbCycleUsed
())
{
executeMandatorySchemaResource
(
"drop"
,
"cycle"
);
}
}
}
public
void
executeMandatorySchemaResource
(
String
operation
,
String
component
)
{
public
void
executeMandatorySchemaResource
(
String
operation
,
String
component
)
{
...
@@ -685,13 +669,6 @@ public class DbSqlSession implements Session {
...
@@ -685,13 +669,6 @@ public class DbSqlSession implements Session {
dbSchemaCreateIdentity
();
dbSchemaCreateIdentity
();
}
}
if
(
isCycleTablePresent
())
{
if
(
isUpgradeNeeded
)
{
dbSchemaUpgrade
(
"cycle"
,
dbVersion
);
}
}
else
if
(
dbSqlSessionFactory
.
isDbCycleUsed
())
{
dbSchemaCreateCycle
();
}
return
feedback
;
return
feedback
;
}
}
...
@@ -704,9 +681,6 @@ public class DbSqlSession implements Session {
...
@@ -704,9 +681,6 @@ public class DbSqlSession implements Session {
public
boolean
isIdentityTablePresent
(){
public
boolean
isIdentityTablePresent
(){
return
isTablePresent
(
"ACT_ID_USER"
);
return
isTablePresent
(
"ACT_ID_USER"
);
}
}
public
boolean
isCycleTablePresent
(){
return
isTablePresent
(
"ACT_CY_CONFIG"
);
}
public
boolean
isTablePresent
(
String
tableName
)
{
public
boolean
isTablePresent
(
String
tableName
)
{
Connection
connection
=
null
;
Connection
connection
=
null
;
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbSqlSessionFactory.java
浏览文件 @
76e6cc7e
...
@@ -71,7 +71,6 @@ public class DbSqlSessionFactory implements SessionFactory {
...
@@ -71,7 +71,6 @@ public class DbSqlSessionFactory implements SessionFactory {
protected
Map
<
Class
<?>,
String
>
selectStatements
=
Collections
.
synchronizedMap
(
new
HashMap
<
Class
<?>,
String
>());
protected
Map
<
Class
<?>,
String
>
selectStatements
=
Collections
.
synchronizedMap
(
new
HashMap
<
Class
<?>,
String
>());
protected
boolean
isDbIdentityUsed
=
true
;
protected
boolean
isDbIdentityUsed
=
true
;
protected
boolean
isDbHistoryUsed
=
true
;
protected
boolean
isDbHistoryUsed
=
true
;
protected
boolean
isDbCycleUsed
=
true
;
public
Class
<
?
>
getSessionType
()
{
public
Class
<
?
>
getSessionType
()
{
return
DbSqlSession
.
class
;
return
DbSqlSession
.
class
;
...
@@ -228,13 +227,4 @@ public class DbSqlSessionFactory implements SessionFactory {
...
@@ -228,13 +227,4 @@ public class DbSqlSessionFactory implements SessionFactory {
this
.
isDbHistoryUsed
=
isDbHistoryUsed
;
this
.
isDbHistoryUsed
=
isDbHistoryUsed
;
}
}
public
boolean
isDbCycleUsed
()
{
return
isDbCycleUsed
;
}
public
void
setDbCycleUsed
(
boolean
isDbCycleUsed
)
{
this
.
isDbCycleUsed
=
isDbCycleUsed
;
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录