Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
4cdc0ab5
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,发现更多精彩内容 >>
提交
4cdc0ab5
编写于
11月 12, 2010
作者:
T
tombaeyens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ACT-162 making the identity component pluggable
上级
dc6d9110
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
223 addition
and
31 deletion
+223
-31
modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngineBuilder.java
...c/main/java/org/activiti/engine/ProcessEngineBuilder.java
+1
-0
modules/activiti-engine/src/main/java/org/activiti/engine/impl/IdentityServiceImpl.java
...in/java/org/activiti/engine/impl/IdentityServiceImpl.java
+8
-4
modules/activiti-engine/src/main/java/org/activiti/engine/impl/TaskQueryImpl.java
...src/main/java/org/activiti/engine/impl/TaskQueryImpl.java
+3
-3
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cfg/IdentitySession.java
...in/java/org/activiti/engine/impl/cfg/IdentitySession.java
+15
-8
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CheckPassword.java
...main/java/org/activiti/engine/impl/cmd/CheckPassword.java
+2
-2
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateGroupCmd.java
...ain/java/org/activiti/engine/impl/cmd/CreateGroupCmd.java
+42
-0
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateGroupQueryCmd.java
...ava/org/activiti/engine/impl/cmd/CreateGroupQueryCmd.java
+34
-0
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateUserCmd.java
...main/java/org/activiti/engine/impl/cmd/CreateUserCmd.java
+42
-0
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateUserQueryCmd.java
...java/org/activiti/engine/impl/cmd/CreateUserQueryCmd.java
+34
-0
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveGroupCmd.java
.../main/java/org/activiti/engine/impl/cmd/SaveGroupCmd.java
+3
-4
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveUserCmd.java
...c/main/java/org/activiti/engine/impl/cmd/SaveUserCmd.java
+2
-4
modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbIdentitySession.java
...n/java/org/activiti/engine/impl/db/DbIdentitySession.java
+37
-6
未找到文件。
modules/activiti-engine/src/main/java/org/activiti/engine/ProcessEngineBuilder.java
浏览文件 @
4cdc0ab5
...
...
@@ -155,6 +155,7 @@ public class ProcessEngineBuilder {
ConfigurationParser
cfgParser
=
new
ConfigurationParser
();
ConfigurationParse
cfgParse
=
cfgParser
.
createParse
()
// .processEngineConfiguration(processEngineConfiguration)
.
sourceInputStream
(
inputStream
)
.
execute
();
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/IdentityServiceImpl.java
浏览文件 @
4cdc0ab5
...
...
@@ -18,7 +18,11 @@ import org.activiti.engine.identity.GroupQuery;
import
org.activiti.engine.identity.User
;
import
org.activiti.engine.identity.UserQuery
;
import
org.activiti.engine.impl.cmd.CheckPassword
;
import
org.activiti.engine.impl.cmd.CreateGroupCmd
;
import
org.activiti.engine.impl.cmd.CreateGroupQueryCmd
;
import
org.activiti.engine.impl.cmd.CreateMembershipCmd
;
import
org.activiti.engine.impl.cmd.CreateUserCmd
;
import
org.activiti.engine.impl.cmd.CreateUserQueryCmd
;
import
org.activiti.engine.impl.cmd.DeleteGroupCmd
;
import
org.activiti.engine.impl.cmd.DeleteMembershipCmd
;
import
org.activiti.engine.impl.cmd.DeleteUserCmd
;
...
...
@@ -36,11 +40,11 @@ import org.activiti.engine.impl.interceptor.CommandExecutor;
public
class
IdentityServiceImpl
extends
ServiceImpl
implements
IdentityService
{
public
Group
newGroup
(
String
groupId
)
{
return
new
GroupEntity
(
groupId
);
return
commandExecutor
.
execute
(
new
CreateGroupCmd
(
groupId
)
);
}
public
User
newUser
(
String
userId
)
{
return
new
UserEntity
(
userId
);
return
commandExecutor
.
execute
(
new
CreateUserCmd
(
userId
)
);
}
public
void
saveGroup
(
Group
group
)
{
...
...
@@ -52,11 +56,11 @@ public class IdentityServiceImpl extends ServiceImpl implements IdentityService
}
public
UserQuery
createUserQuery
()
{
return
new
UserQueryImpl
(
commandExecutor
);
return
commandExecutor
.
execute
(
new
CreateUserQueryCmd
()
);
}
public
GroupQuery
createGroupQuery
()
{
return
new
GroupQueryImpl
(
commandExecutor
);
return
commandExecutor
.
execute
(
new
CreateGroupQueryCmd
()
);
}
public
void
createMembership
(
String
userId
,
String
groupId
)
{
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/TaskQueryImpl.java
浏览文件 @
4cdc0ab5
...
...
@@ -18,7 +18,7 @@ import java.util.Date;
import
java.util.List
;
import
org.activiti.engine.ActivitiException
;
import
org.activiti.engine.i
mpl.identity.GroupEntity
;
import
org.activiti.engine.i
dentity.Group
;
import
org.activiti.engine.impl.interceptor.CommandContext
;
import
org.activiti.engine.impl.interceptor.CommandExecutor
;
import
org.activiti.engine.task.Task
;
...
...
@@ -168,12 +168,12 @@ public class TaskQueryImpl extends AbstractQuery<TaskQuery, Task> implements Tas
}
protected
List
<
String
>
getGroupsForCandidateUser
(
String
candidateUser
)
{
List
<
Group
Entity
>
groups
=
CommandContext
List
<
Group
>
groups
=
CommandContext
.
getCurrent
()
.
getIdentitySession
()
.
findGroupsByUser
(
candidateUser
);
List
<
String
>
groupIds
=
new
ArrayList
<
String
>();
for
(
Group
Entity
group
:
groups
)
{
for
(
Group
group
:
groups
)
{
groupIds
.
add
(
group
.
getId
());
}
return
groupIds
;
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cfg/IdentitySession.java
浏览文件 @
4cdc0ab5
...
...
@@ -16,10 +16,11 @@ package org.activiti.engine.impl.cfg;
import
java.util.List
;
import
org.activiti.engine.identity.Group
;
import
org.activiti.engine.identity.GroupQuery
;
import
org.activiti.engine.identity.User
;
import
org.activiti.engine.identity.UserQuery
;
import
org.activiti.engine.impl.Page
;
import
org.activiti.engine.impl.identity.GroupEntity
;
import
org.activiti.engine.impl.identity.UserEntity
;
import
org.activiti.engine.impl.interceptor.CommandExecutor
;
/**
...
...
@@ -28,19 +29,25 @@ import org.activiti.engine.impl.identity.UserEntity;
public
interface
IdentitySession
{
/* User */
void
insertUser
(
UserEntity
user
);
User
createNewUser
(
String
userId
);
void
insertUser
(
User
user
);
void
updateUser
(
User
updatedUser
);
void
deleteUser
(
String
userId
);
User
Entity
findUserById
(
String
userId
);
List
<
User
Entity
>
findUsersByGroupId
(
String
groupId
);
User
findUserById
(
String
userId
);
List
<
User
>
findUsersByGroupId
(
String
groupId
);
boolean
isValidUser
(
String
userId
);
UserQuery
createNewUserQuery
(
CommandExecutor
commandExecutor
);
List
<
User
>
findUserByQueryCriteria
(
Object
query
,
Page
page
);
long
findUserCountByQueryCriteria
(
Object
query
);
/* Group */
void
insertGroup
(
GroupEntity
group
);
GroupEntity
findGroupById
(
String
groupId
);
List
<
GroupEntity
>
findGroupsByUser
(
String
userId
);
Group
createNewGroup
(
String
groupId
);
void
insertGroup
(
Group
group
);
void
updateGroup
(
Group
updatedGroup
);
void
deleteGroup
(
String
groupId
);
Group
findGroupById
(
String
groupId
);
List
<
Group
>
findGroupsByUser
(
String
userId
);
GroupQuery
createNewGroupQuery
(
CommandExecutor
commandExecutor
);
List
<
Group
>
findGroupByQueryCriteria
(
Object
query
,
Page
page
);
long
findGroupCountByQueryCriteria
(
Object
query
);
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CheckPassword.java
浏览文件 @
4cdc0ab5
...
...
@@ -12,8 +12,8 @@
*/
package
org.activiti.engine.impl.cmd
;
import
org.activiti.engine.identity.User
;
import
org.activiti.engine.impl.cfg.IdentitySession
;
import
org.activiti.engine.impl.identity.UserEntity
;
import
org.activiti.engine.impl.interceptor.Command
;
import
org.activiti.engine.impl.interceptor.CommandContext
;
...
...
@@ -34,7 +34,7 @@ public class CheckPassword implements Command<Boolean> {
public
Boolean
execute
(
CommandContext
commandContext
)
{
IdentitySession
identitySession
=
commandContext
.
getIdentitySession
();
User
Entity
user
=
identitySession
.
findUserById
(
userId
);
User
user
=
identitySession
.
findUserById
(
userId
);
if
(
(
user
!=
null
)
&&
(
password
!=
null
)
&&
(
password
.
equals
(
user
.
getPassword
()))
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateGroupCmd.java
0 → 100644
浏览文件 @
4cdc0ab5
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.activiti.engine.impl.cmd
;
import
org.activiti.engine.ActivitiException
;
import
org.activiti.engine.identity.Group
;
import
org.activiti.engine.impl.interceptor.Command
;
import
org.activiti.engine.impl.interceptor.CommandContext
;
/**
* @author Tom Baeyens
*/
public
class
CreateGroupCmd
implements
Command
<
Group
>
{
protected
String
groupId
;
public
CreateGroupCmd
(
String
groupId
)
{
if
(
groupId
==
null
)
{
throw
new
ActivitiException
(
"groupId is null"
);
}
this
.
groupId
=
groupId
;
}
public
Group
execute
(
CommandContext
commandContext
)
{
return
commandContext
.
getIdentitySession
()
.
createNewGroup
(
groupId
);
}
}
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateGroupQueryCmd.java
0 → 100644
浏览文件 @
4cdc0ab5
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.activiti.engine.impl.cmd
;
import
org.activiti.engine.identity.GroupQuery
;
import
org.activiti.engine.impl.interceptor.Command
;
import
org.activiti.engine.impl.interceptor.CommandContext
;
import
org.activiti.engine.impl.interceptor.CommandExecutor
;
/**
* @author Tom Baeyens
*/
public
class
CreateGroupQueryCmd
implements
Command
<
GroupQuery
>
{
public
GroupQuery
execute
(
CommandContext
commandContext
)
{
CommandExecutor
commandExecutor
=
commandContext
.
getProcessEngineConfiguration
().
getCommandExecutorTxRequired
();
return
commandContext
.
getIdentitySession
()
.
createNewGroupQuery
(
commandExecutor
);
}
}
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateUserCmd.java
0 → 100644
浏览文件 @
4cdc0ab5
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.activiti.engine.impl.cmd
;
import
org.activiti.engine.ActivitiException
;
import
org.activiti.engine.identity.User
;
import
org.activiti.engine.impl.interceptor.Command
;
import
org.activiti.engine.impl.interceptor.CommandContext
;
/**
* @author Tom Baeyens
*/
public
class
CreateUserCmd
implements
Command
<
User
>
{
protected
String
userId
;
public
CreateUserCmd
(
String
userId
)
{
if
(
userId
==
null
)
{
throw
new
ActivitiException
(
"userId is null"
);
}
this
.
userId
=
userId
;
}
public
User
execute
(
CommandContext
commandContext
)
{
return
commandContext
.
getIdentitySession
()
.
createNewUser
(
userId
);
}
}
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateUserQueryCmd.java
0 → 100644
浏览文件 @
4cdc0ab5
/* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.activiti.engine.impl.cmd
;
import
org.activiti.engine.identity.UserQuery
;
import
org.activiti.engine.impl.interceptor.Command
;
import
org.activiti.engine.impl.interceptor.CommandContext
;
import
org.activiti.engine.impl.interceptor.CommandExecutor
;
/**
* @author Tom Baeyens
*/
public
class
CreateUserQueryCmd
implements
Command
<
UserQuery
>
{
public
UserQuery
execute
(
CommandContext
commandContext
)
{
CommandExecutor
commandExecutor
=
commandContext
.
getProcessEngineConfiguration
().
getCommandExecutorTxRequired
();
return
commandContext
.
getIdentitySession
()
.
createNewUserQuery
(
commandExecutor
);
}
}
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveGroupCmd.java
浏览文件 @
4cdc0ab5
...
...
@@ -13,6 +13,7 @@
package
org.activiti.engine.impl.cmd
;
import
org.activiti.engine.ActivitiException
;
import
org.activiti.engine.identity.Group
;
import
org.activiti.engine.impl.identity.GroupEntity
;
import
org.activiti.engine.impl.interceptor.Command
;
import
org.activiti.engine.impl.interceptor.CommandContext
;
...
...
@@ -38,11 +39,9 @@ public class SaveGroupCmd implements Command<Void> {
.
getIdentitySession
()
.
insertGroup
(
group
);
}
else
{
GroupEntity
persistentGroup
=
commandContext
commandContext
.
getIdentitySession
()
.
findGroupById
(
group
.
getId
());
persistentGroup
.
update
(
group
);
.
updateGroup
(
group
);
}
return
null
;
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveUserCmd.java
浏览文件 @
4cdc0ab5
...
...
@@ -39,11 +39,9 @@ public class SaveUserCmd implements Command<Void> {
.
getIdentitySession
()
.
insertUser
(
user
);
}
else
{
UserEntity
persistentUser
=
commandContext
commandContext
.
getIdentitySession
()
.
findUserById
(
user
.
getId
());
persistentUser
.
update
(
user
);
.
updateUser
(
user
);
}
return
null
;
...
...
modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbIdentitySession.java
浏览文件 @
4cdc0ab5
...
...
@@ -18,12 +18,17 @@ import java.util.List;
import
java.util.Map
;
import
org.activiti.engine.identity.Group
;
import
org.activiti.engine.identity.GroupQuery
;
import
org.activiti.engine.identity.User
;
import
org.activiti.engine.identity.UserQuery
;
import
org.activiti.engine.impl.GroupQueryImpl
;
import
org.activiti.engine.impl.Page
;
import
org.activiti.engine.impl.UserQueryImpl
;
import
org.activiti.engine.impl.cfg.IdentitySession
;
import
org.activiti.engine.impl.identity.GroupEntity
;
import
org.activiti.engine.impl.identity.UserEntity
;
import
org.activiti.engine.impl.interceptor.CommandContext
;
import
org.activiti.engine.impl.interceptor.CommandExecutor
;
import
org.activiti.engine.impl.interceptor.Session
;
...
...
@@ -38,8 +43,8 @@ public class DbIdentitySession implements IdentitySession, Session {
this
.
dbSqlSession
=
CommandContext
.
getCurrentSession
(
DbSqlSession
.
class
);
}
public
void
insertUser
(
User
Entity
user
)
{
dbSqlSession
.
insert
(
user
);
public
void
insertUser
(
User
user
)
{
dbSqlSession
.
insert
(
(
PersistentObject
)
user
);
}
public
UserEntity
findUserById
(
String
userId
)
{
...
...
@@ -47,7 +52,7 @@ public class DbIdentitySession implements IdentitySession, Session {
}
@SuppressWarnings
(
"unchecked"
)
public
List
<
User
Entity
>
findUsersByGroupId
(
String
groupId
)
{
public
List
<
User
>
findUsersByGroupId
(
String
groupId
)
{
return
dbSqlSession
.
selectList
(
"selectUsersByGroupId"
,
groupId
);
}
...
...
@@ -60,8 +65,8 @@ public class DbIdentitySession implements IdentitySession, Session {
dbSqlSession
.
delete
(
"deleteUser"
,
userId
);
}
public
void
insertGroup
(
Group
Entity
group
)
{
dbSqlSession
.
insert
(
group
);
public
void
insertGroup
(
Group
group
)
{
dbSqlSession
.
insert
(
(
PersistentObject
)
group
);
}
public
GroupEntity
findGroupById
(
String
groupId
)
{
...
...
@@ -69,7 +74,7 @@ public class DbIdentitySession implements IdentitySession, Session {
}
@SuppressWarnings
(
"unchecked"
)
public
List
<
Group
Entity
>
findGroupsByUser
(
String
userId
)
{
public
List
<
Group
>
findGroupsByUser
(
String
userId
)
{
return
dbSqlSession
.
selectList
(
"selectGroupsByUserId"
,
userId
);
}
...
...
@@ -110,6 +115,32 @@ public class DbIdentitySession implements IdentitySession, Session {
return
(
Long
)
dbSqlSession
.
selectOne
(
"selectGroupCountByQueryCriteria"
,
query
);
}
public
Group
createNewGroup
(
String
groupId
)
{
return
new
GroupEntity
(
groupId
);
}
public
GroupQuery
createNewGroupQuery
(
CommandExecutor
commandExecutor
)
{
return
new
GroupQueryImpl
(
commandExecutor
);
}
public
User
createNewUser
(
String
userId
)
{
return
new
UserEntity
(
userId
);
}
public
UserQuery
createNewUserQuery
(
CommandExecutor
commandExecutor
)
{
return
new
UserQueryImpl
(
commandExecutor
);
}
public
void
updateGroup
(
Group
updatedGroup
)
{
GroupEntity
persistentGroup
=
findGroupById
(
updatedGroup
.
getId
());
persistentGroup
.
update
((
GroupEntity
)
updatedGroup
);
}
public
void
updateUser
(
User
updatedUser
)
{
UserEntity
persistentUser
=
findUserById
(
updatedUser
.
getId
());
persistentUser
.
update
((
UserEntity
)
updatedUser
);
}
public
void
close
()
{
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录