Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
670d0e4c
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,发现更多精彩内容 >>
提交
670d0e4c
编写于
7月 28, 2017
作者:
C
cdeneux
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[IDM] Fix a regression about LDAP integration introduced with commit
148f4f24
(Perhaps the LDAP integration is no more working)
上级
31273fb6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
36 addition
and
33 deletion
+36
-33
modules/flowable-ldap-configurator/src/main/java/org/flowable/ldap/LDAPConfigurator.java
...tor/src/main/java/org/flowable/ldap/LDAPConfigurator.java
+4
-2
modules/flowable-ldap-configurator/src/test/resources/flowable-context.xml
...ldap-configurator/src/test/resources/flowable-context.xml
+32
-31
未找到文件。
modules/flowable-ldap-configurator/src/main/java/org/flowable/ldap/LDAPConfigurator.java
浏览文件 @
670d0e4c
...
...
@@ -12,9 +12,9 @@
*/
package
org.flowable.ldap
;
import
org.flowable.engine.cfg.AbstractProcessEngineConfigurator
;
import
org.flowable.engine.cfg.ProcessEngineConfigurator
;
import
org.flowable.engine.common.api.FlowableException
;
import
org.flowable.engine.impl.cfg.IdmEngineConfigurator
;
import
org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl
;
import
org.flowable.engine.impl.util.EngineServiceUtil
;
...
...
@@ -28,7 +28,7 @@ import org.flowable.engine.impl.util.EngineServiceUtil;
*
* @author Joram Barrez
*/
public
class
LDAPConfigurator
extends
AbstractProcess
EngineConfigurator
{
public
class
LDAPConfigurator
extends
Idm
EngineConfigurator
{
protected
LDAPConfiguration
ldapConfiguration
;
...
...
@@ -40,6 +40,8 @@ public class LDAPConfigurator extends AbstractProcessEngineConfigurator {
@Override
public
void
configure
(
ProcessEngineConfigurationImpl
processEngineConfiguration
)
{
super
.
configure
(
processEngineConfiguration
);
if
(
ldapConfiguration
==
null
)
{
throw
new
FlowableException
(
"ldapConfiguration is not set"
);
}
...
...
modules/flowable-ldap-configurator/src/test/resources/flowable-context.xml
浏览文件 @
670d0e4c
...
...
@@ -28,37 +28,38 @@
<property
name=
"dataSource"
ref=
"dataSource"
/>
<property
name=
"transactionManager"
ref=
"transactionManager"
/>
<property
name=
"databaseSchemaUpdate"
value=
"true"
/>
<property
name=
"idmProcessEngineConfigurator"
>
<bean
class=
"org.flowable.ldap.LDAPConfigurator"
>
<property
name=
"ldapConfiguration"
>
<bean
class=
"org.flowable.ldap.LDAPConfiguration"
>
<!-- Server connection params -->
<property
name=
"server"
value=
"ldap://localhost"
/>
<property
name=
"port"
value=
"33389"
/>
<property
name=
"user"
value=
"uid=admin, ou=users, o=flowable"
/>
<property
name=
"password"
value=
"pass"
/>
<!-- Query params -->
<property
name=
"baseDn"
value=
"o=flowable"
/>
<property
name=
"queryUserByUserId"
value=
"(&(objectClass=inetOrgPerson)(uid={0}))"
/>
<property
name=
"queryUserByFullNameLike"
value=
"(&(objectClass=inetOrgPerson)(|({0}=*{1}*)({2}=*{3}*)))"
/>
<property
name=
"queryAllUsers"
value=
"(objectClass=inetOrgPerson)"
/>
<property
name=
"queryGroupsForUser"
value=
"(&(objectClass=groupOfUniqueNames)(uniqueMember={0}))"
/>
<property
name=
"queryAllGroups"
value=
"(objectClass=groupOfUniqueNames)"
/>
<!-- Attribute config -->
<property
name=
"userIdAttribute"
value=
"uid"
/>
<property
name=
"userFirstNameAttribute"
value=
"cn"
/>
<property
name=
"userLastNameAttribute"
value=
"sn"
/>
<property
name=
"userEmailAttribute"
value=
"mail"
/>
<property
name=
"groupIdAttribute"
value=
"uid"
/>
<property
name=
"groupNameAttribute"
value=
"cn"
/>
</bean>
</property>
</bean>
<property
name=
"configurators"
>
<list>
<bean
class=
"org.flowable.ldap.LDAPConfigurator"
>
<property
name=
"ldapConfiguration"
>
<bean
class=
"org.flowable.ldap.LDAPConfiguration"
>
<!-- Server connection params -->
<property
name=
"server"
value=
"ldap://localhost"
/>
<property
name=
"port"
value=
"33389"
/>
<property
name=
"user"
value=
"uid=admin, ou=users, o=flowable"
/>
<property
name=
"password"
value=
"pass"
/>
<!-- Query params -->
<property
name=
"baseDn"
value=
"o=flowable"
/>
<property
name=
"queryUserByUserId"
value=
"(&(objectClass=inetOrgPerson)(uid={0}))"
/>
<property
name=
"queryUserByFullNameLike"
value=
"(&(objectClass=inetOrgPerson)(|({0}=*{1}*)({2}=*{3}*)))"
/>
<property
name=
"queryAllUsers"
value=
"(objectClass=inetOrgPerson)"
/>
<property
name=
"queryGroupsForUser"
value=
"(&(objectClass=groupOfUniqueNames)(uniqueMember={0}))"
/>
<property
name=
"queryAllGroups"
value=
"(objectClass=groupOfUniqueNames)"
/>
<!-- Attribute config -->
<property
name=
"userIdAttribute"
value=
"uid"
/>
<property
name=
"userFirstNameAttribute"
value=
"cn"
/>
<property
name=
"userLastNameAttribute"
value=
"sn"
/>
<property
name=
"userEmailAttribute"
value=
"mail"
/>
<property
name=
"groupIdAttribute"
value=
"uid"
/>
<property
name=
"groupNameAttribute"
value=
"cn"
/>
</bean>
</property>
</bean>
</list>
</property>
</bean>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录