Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
6fec077a
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,发现更多精彩内容 >>
提交
6fec077a
编写于
9月 07, 2010
作者:
F
falko.menge
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Reverted changes of revision 547 in order to try another solution for Oryx compatibility
上级
5950c1ba
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
14 addition
and
12 deletion
+14
-12
distro/src/setup/files/cfg.cycle/cycle.properties
distro/src/setup/files/cfg.cycle/cycle.properties
+2
-2
modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/connector/signavio/SignavioConnectorConfiguration.java
...pl/connector/signavio/SignavioConnectorConfiguration.java
+5
-3
modules/activiti-cycle/src/test/java/org/activiti/cycle/impl/conf/RepositoryConnectorConfigurationManagerImplTest.java
...conf/RepositoryConnectorConfigurationManagerImplTest.java
+2
-2
modules/activiti-cycle/src/test/java/org/activiti/cycle/impl/connector/demo/DemoConnectorTest.java
...activiti/cycle/impl/connector/demo/DemoConnectorTest.java
+1
-1
modules/activiti-cycle/src/test/java/org/activiti/cycle/impl/connector/signavio/SignavioConnectorTest.java
.../cycle/impl/connector/signavio/SignavioConnectorTest.java
+1
-1
modules/activiti-rest/src/main/java/org/activiti/rest/api/cycle/SessionUtil.java
...rc/main/java/org/activiti/rest/api/cycle/SessionUtil.java
+1
-1
userguide/src/en/chapters/ch09-Cycle.xml
userguide/src/en/chapters/ch09-Cycle.xml
+2
-2
未找到文件。
distro/src/setup/files/cfg.cycle/cycle.properties
浏览文件 @
6fec077a
activiti.modeler.base.url
=
http://localhost:8080/activiti-modeler/
p/
activiti.modeler.base.url
=
http://localhost:8080/activiti-modeler/
cycle.workspace.file.path
=
eclipse-workspace
cycle.workspace.file.path
=
eclipse-workspace
\ No newline at end of file
modules/activiti-cycle/src/main/java/org/activiti/cycle/impl/connector/signavio/SignavioConnectorConfiguration.java
浏览文件 @
6fec077a
...
@@ -36,6 +36,9 @@ public class SignavioConnectorConfiguration extends PasswordEnabledRepositoryCon
...
@@ -36,6 +36,9 @@ public class SignavioConnectorConfiguration extends PasswordEnabledRepositoryCon
* OSS version (where trying to login leads to an exception)
* OSS version (where trying to login leads to an exception)
*/
*/
private
boolean
loginRequired
=
false
;
private
boolean
loginRequired
=
false
;
//
public
static
String
SIGNAVIO_BACKEND_URL_SUFFIX
=
"p/"
;
public
static
String
REGISTRATION_URL_SUFFIX
=
"register/"
;
public
static
String
REGISTRATION_URL_SUFFIX
=
"register/"
;
public
static
String
LOGIN_URL_SUFFIX
=
"login/"
;
public
static
String
LOGIN_URL_SUFFIX
=
"login/"
;
...
@@ -50,8 +53,7 @@ public class SignavioConnectorConfiguration extends PasswordEnabledRepositoryCon
...
@@ -50,8 +53,7 @@ public class SignavioConnectorConfiguration extends PasswordEnabledRepositoryCon
public
static
String
BPMN_20_IMPORT_SERVLET
=
"editor/bpmn2_0deserialization"
;
public
static
String
BPMN_20_IMPORT_SERVLET
=
"editor/bpmn2_0deserialization"
;
public
SignavioConnectorConfiguration
()
{
public
SignavioConnectorConfiguration
()
{
// '.../p/' is not standard for all Signavio/Oryx configurations
signavioBaseUrl
=
"http://127.0.0.1:8080/"
;
signavioBaseUrl
=
"http://127.0.0.1:8080/p/"
;
}
}
public
SignavioConnectorConfiguration
(
String
signavioUrl
)
{
public
SignavioConnectorConfiguration
(
String
signavioUrl
)
{
...
@@ -83,7 +85,7 @@ public class SignavioConnectorConfiguration extends PasswordEnabledRepositoryCon
...
@@ -83,7 +85,7 @@ public class SignavioConnectorConfiguration extends PasswordEnabledRepositoryCon
}
}
public
String
getSignavioBackendUrl
()
{
public
String
getSignavioBackendUrl
()
{
return
getSignavioUrl
();
return
getSignavioUrl
()
+
SIGNAVIO_BACKEND_URL_SUFFIX
;
}
}
public
String
getDirectoryIdFromUrl
(
String
href
)
{
public
String
getDirectoryIdFromUrl
(
String
href
)
{
...
...
modules/activiti-cycle/src/test/java/org/activiti/cycle/impl/conf/RepositoryConnectorConfigurationManagerImplTest.java
浏览文件 @
6fec077a
...
@@ -38,7 +38,7 @@ public class RepositoryConnectorConfigurationManagerImplTest {
...
@@ -38,7 +38,7 @@ public class RepositoryConnectorConfigurationManagerImplTest {
try
{
try
{
ConfigurationContainer
enterpriseConfiguration
=
new
ConfigurationContainer
(
"camunda"
);
ConfigurationContainer
enterpriseConfiguration
=
new
ConfigurationContainer
(
"camunda"
);
// This one is for all, so don't save a password, the GUI should query it!
// This one is for all, so don't save a password, the GUI should query it!
RepositoryConnectorConfiguration
conf1
=
new
SignavioConnectorConfiguration
(
"Activiti Modeler"
,
"http://localhost:8080/activiti-modeler/
p/
"
);
RepositoryConnectorConfiguration
conf1
=
new
SignavioConnectorConfiguration
(
"Activiti Modeler"
,
"http://localhost:8080/activiti-modeler/"
);
enterpriseConfiguration
.
addRepositoryConnectorConfiguration
(
conf1
);
enterpriseConfiguration
.
addRepositoryConnectorConfiguration
(
conf1
);
ConfigurationContainer
userConfiguration
=
new
ConfigurationContainer
(
"bernd"
);
ConfigurationContainer
userConfiguration
=
new
ConfigurationContainer
(
"bernd"
);
...
@@ -117,7 +117,7 @@ public class RepositoryConnectorConfigurationManagerImplTest {
...
@@ -117,7 +117,7 @@ public class RepositoryConnectorConfigurationManagerImplTest {
// // create configurations
// // create configurations
// repoConfManager.persistRepositoryConfiguration(new
// repoConfManager.persistRepositoryConfiguration(new
// SignavioConnectorConfiguration("Activiti Modeler",
// SignavioConnectorConfiguration("Activiti Modeler",
// "http://localhost:8080/activiti-modeler/
p/
", null,
// "http://localhost:8080/activiti-modeler/", null,
// "christian.lipphardt", "xxx"));
// "christian.lipphardt", "xxx"));
// repoConfManager.persistRepositoryConfiguration(new
// repoConfManager.persistRepositoryConfiguration(new
// FileSystemConnectorConfiguration("Hard Drive", new File("c:")));
// FileSystemConnectorConfiguration("Hard Drive", new File("c:")));
...
...
modules/activiti-cycle/src/test/java/org/activiti/cycle/impl/connector/demo/DemoConnectorTest.java
浏览文件 @
6fec077a
...
@@ -105,7 +105,7 @@ public class DemoConnectorTest {
...
@@ -105,7 +105,7 @@ public class DemoConnectorTest {
ConfigurationContainer
configuration
=
new
ConfigurationContainer
(
"bernd"
);
ConfigurationContainer
configuration
=
new
ConfigurationContainer
(
"bernd"
);
configuration
.
addRepositoryConnectorConfiguration
(
new
DemoConnectorConfiguration
(
"demo"
));
configuration
.
addRepositoryConnectorConfiguration
(
new
DemoConnectorConfiguration
(
"demo"
));
configuration
.
addRepositoryConnectorConfiguration
(
new
SignavioConnectorConfiguration
(
"signavio"
,
"http://localhost:8080/activiti-modeler/
p/
"
));
configuration
.
addRepositoryConnectorConfiguration
(
new
SignavioConnectorConfiguration
(
"signavio"
,
"http://localhost:8080/activiti-modeler/"
));
configuration
.
addRepositoryConnectorConfiguration
(
new
FileSystemConnectorConfiguration
(
"files"
,
new
File
(
"C:/temp"
)));
configuration
.
addRepositoryConnectorConfiguration
(
new
FileSystemConnectorConfiguration
(
"files"
,
new
File
(
"C:/temp"
)));
RepositoryConnector
conn
=
new
CustomizedViewConfiguration
(
"http://localhost:8080/activiti-cycle/"
,
configuration
).
createConnector
();
RepositoryConnector
conn
=
new
CustomizedViewConfiguration
(
"http://localhost:8080/activiti-cycle/"
,
configuration
).
createConnector
();
...
...
modules/activiti-cycle/src/test/java/org/activiti/cycle/impl/connector/signavio/SignavioConnectorTest.java
浏览文件 @
6fec077a
...
@@ -80,7 +80,7 @@ public class SignavioConnectorTest {
...
@@ -80,7 +80,7 @@ public class SignavioConnectorTest {
System
.
out
.
println
(
"SourceJSON:\n"
+
sourceJson
);
System
.
out
.
println
(
"SourceJSON:\n"
+
sourceJson
);
// create signavio conf + connector
// create signavio conf + connector
SignavioConnectorConfiguration
conf
=
new
SignavioConnectorConfiguration
(
"http://localhost:8080/activiti-modeler/
p/
"
);
SignavioConnectorConfiguration
conf
=
new
SignavioConnectorConfiguration
(
"http://localhost:8080/activiti-modeler/"
);
SignavioConnector
connector
=
new
SignavioConnector
(
conf
);
SignavioConnector
connector
=
new
SignavioConnector
(
conf
);
// test pre-transformation json to bpmn20 xml
// test pre-transformation json to bpmn20 xml
...
...
modules/activiti-rest/src/main/java/org/activiti/rest/api/cycle/SessionUtil.java
浏览文件 @
6fec077a
...
@@ -85,7 +85,7 @@ public class SessionUtil {
...
@@ -85,7 +85,7 @@ public class SessionUtil {
public
static
ConfigurationContainer
createDefaultDemoConfiguration
(
String
currentUserId
)
{
public
static
ConfigurationContainer
createDefaultDemoConfiguration
(
String
currentUserId
)
{
ConfigurationContainer
configuration
=
new
ConfigurationContainer
(
currentUserId
);
ConfigurationContainer
configuration
=
new
ConfigurationContainer
(
currentUserId
);
configuration
.
addRepositoryConnectorConfiguration
(
new
DemoConnectorConfiguration
(
"demo"
));
configuration
.
addRepositoryConnectorConfiguration
(
new
DemoConnectorConfiguration
(
"demo"
));
configuration
.
addRepositoryConnectorConfiguration
(
new
SignavioConnectorConfiguration
(
"signavio"
,
"http://localhost:8080/activiti-modeler/
p/
"
));
configuration
.
addRepositoryConnectorConfiguration
(
new
SignavioConnectorConfiguration
(
"signavio"
,
"http://localhost:8080/activiti-modeler/"
));
configuration
.
addRepositoryConnectorConfiguration
(
new
FileSystemConnectorConfiguration
(
"files"
,
fsBaseDir
));
configuration
.
addRepositoryConnectorConfiguration
(
new
FileSystemConnectorConfiguration
(
"files"
,
fsBaseDir
));
return
configuration
;
return
configuration
;
}
}
...
...
userguide/src/en/chapters/ch09-Cycle.xml
浏览文件 @
6fec077a
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
<
org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration
>
<
org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration
>
<
name
>
Activiti Modeler
<
/name
>
<
name
>
Activiti Modeler
<
/name
>
<
credentialsSaved
>
false
<
/credentialsSaved
>
<
credentialsSaved
>
false
<
/credentialsSaved
>
<
signavioBaseUrl
>
http://localhost:8080/activiti-modeler/
p/
<
/signavioBaseUrl
>
<
signavioBaseUrl
>
http://localhost:8080/activiti-modeler/
<
/signavioBaseUrl
>
<
loginRequired
>
false
<
/loginRequired
>
<
loginRequired
>
false
<
/loginRequired
>
<
/org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration
>
<
/org.activiti.cycle.impl.connector.signavio.SignavioConnectorConfiguration
>
...
@@ -75,4 +75,4 @@
...
@@ -75,4 +75,4 @@
<mediaobject><imageobject><imagedata
align=
"center"
fileref=
"images/activiti.cycle.action.forms.png"
/></imageobject></mediaobject>
<mediaobject><imageobject><imagedata
align=
"center"
fileref=
"images/activiti.cycle.action.forms.png"
/></imageobject></mediaobject>
</section>
</section>
</chapter>
</chapter>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录