You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/11/28 18:18:22 UTC
[1/5] syncope git commit: Upgrading Groovy
Repository: syncope
Updated Branches:
refs/heads/1_2_X 35d148ce8 -> e414b79be
refs/heads/master d8b6f4ba6 -> 9ec536493
Upgrading Groovy
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d5061bc3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d5061bc3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d5061bc3
Branch: refs/heads/1_2_X
Commit: d5061bc3db33c32d721f97e6914d02344c44475e
Parents: 35d148c
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Nov 28 15:44:41 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Nov 28 15:44:41 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d5061bc3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index da248ef..e0aa680 100644
--- a/pom.xml
+++ b/pom.xml
@@ -343,7 +343,7 @@ under the License.
<wicket.version>6.18.0</wicket.version>
- <groovy.version>2.3.6</groovy.version>
+ <groovy.version>2.3.8</groovy.version>
<h2.version>1.4.182</h2.version>
[4/5] syncope git commit: [SYNCOPE-611] Forms are now retrieved
depending on candidate or assignment
Posted by il...@apache.org.
[SYNCOPE-611] Forms are now retrieved depending on candidate or assignment
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e414b79b
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e414b79b
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e414b79b
Branch: refs/heads/1_2_X
Commit: e414b79bead9bfc4044a8a8dde6a95b1855cf354
Parents: d5061bc
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Nov 28 18:18:04 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Nov 28 18:18:04 2014 +0100
----------------------------------------------------------------------
.../activiti/ActivitiUserWorkflowAdapter.java | 36 ++++++++++++++++++--
1 file changed, 33 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e414b79b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
index 2587706..78968ab 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
@@ -682,14 +682,42 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
return formTO;
}
+ @Transactional(readOnly = true)
@Override
public List<WorkflowFormTO> getForms() {
- return getForms(taskService.createTaskQuery().taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE));
+ List<WorkflowFormTO> forms = new ArrayList<WorkflowFormTO>();
+
+ String authUser = EntitlementUtil.getAuthenticatedUsername();
+ if (adminUser.equals(authUser)) {
+ forms.addAll(getForms(taskService.createTaskQuery().
+ taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE)));
+ } else {
+ SyncopeUser user = userDAO.find(authUser);
+ if (user == null) {
+ throw new NotFoundException("Syncope User " + authUser);
+ }
+
+ forms.addAll(getForms(taskService.createTaskQuery().
+ taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE).
+ taskCandidateOrAssigned(user.getId().toString())));
+
+ List<String> candidateGroups = new ArrayList<String>();
+ for (Long roleId : user.getRoleIds()) {
+ candidateGroups.add(roleId.toString());
+ }
+ if (!candidateGroups.isEmpty()) {
+ forms.addAll(getForms(taskService.createTaskQuery().
+ taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE).
+ taskCandidateGroupIn(candidateGroups)));
+ }
+ }
+
+ return forms;
}
@Override
public List<WorkflowFormTO> getForms(final String workflowId, final String name) {
- final List<WorkflowFormTO> forms = getForms(
+ List<WorkflowFormTO> forms = getForms(
taskService.createTaskQuery().processInstanceId(workflowId).taskName(name).
taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE));
@@ -700,7 +728,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
}
private <T extends Query<?, ?>, U extends Object> List<WorkflowFormTO> getForms(final Query<T, U> query) {
- final List<WorkflowFormTO> forms = new ArrayList<WorkflowFormTO>();
+ List<WorkflowFormTO> forms = new ArrayList<WorkflowFormTO>();
for (U obj : query.list()) {
try {
@@ -772,6 +800,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
return new SimpleEntry<Task, TaskFormData>(task, formData);
}
+ @Transactional
@Override
public WorkflowFormTO claimForm(final String taskId, final String username)
throws WorkflowException {
@@ -797,6 +826,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
return getFormTO(task, checked.getValue());
}
+ @Transactional
@Override
public WorkflowResult<UserMod> submitForm(final WorkflowFormTO form, final String username)
throws WorkflowException {
[3/5] syncope git commit: [SYNCOPE-611] Forms are now retrieved
depending on candidate or assignment
Posted by il...@apache.org.
[SYNCOPE-611] Forms are now retrieved depending on candidate or assignment
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e414b79b
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e414b79b
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e414b79b
Branch: refs/heads/master
Commit: e414b79bead9bfc4044a8a8dde6a95b1855cf354
Parents: d5061bc
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Nov 28 18:18:04 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Nov 28 18:18:04 2014 +0100
----------------------------------------------------------------------
.../activiti/ActivitiUserWorkflowAdapter.java | 36 ++++++++++++++++++--
1 file changed, 33 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e414b79b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
index 2587706..78968ab 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
@@ -682,14 +682,42 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
return formTO;
}
+ @Transactional(readOnly = true)
@Override
public List<WorkflowFormTO> getForms() {
- return getForms(taskService.createTaskQuery().taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE));
+ List<WorkflowFormTO> forms = new ArrayList<WorkflowFormTO>();
+
+ String authUser = EntitlementUtil.getAuthenticatedUsername();
+ if (adminUser.equals(authUser)) {
+ forms.addAll(getForms(taskService.createTaskQuery().
+ taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE)));
+ } else {
+ SyncopeUser user = userDAO.find(authUser);
+ if (user == null) {
+ throw new NotFoundException("Syncope User " + authUser);
+ }
+
+ forms.addAll(getForms(taskService.createTaskQuery().
+ taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE).
+ taskCandidateOrAssigned(user.getId().toString())));
+
+ List<String> candidateGroups = new ArrayList<String>();
+ for (Long roleId : user.getRoleIds()) {
+ candidateGroups.add(roleId.toString());
+ }
+ if (!candidateGroups.isEmpty()) {
+ forms.addAll(getForms(taskService.createTaskQuery().
+ taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE).
+ taskCandidateGroupIn(candidateGroups)));
+ }
+ }
+
+ return forms;
}
@Override
public List<WorkflowFormTO> getForms(final String workflowId, final String name) {
- final List<WorkflowFormTO> forms = getForms(
+ List<WorkflowFormTO> forms = getForms(
taskService.createTaskQuery().processInstanceId(workflowId).taskName(name).
taskVariableValueEquals(TASK_IS_FORM, Boolean.TRUE));
@@ -700,7 +728,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
}
private <T extends Query<?, ?>, U extends Object> List<WorkflowFormTO> getForms(final Query<T, U> query) {
- final List<WorkflowFormTO> forms = new ArrayList<WorkflowFormTO>();
+ List<WorkflowFormTO> forms = new ArrayList<WorkflowFormTO>();
for (U obj : query.list()) {
try {
@@ -772,6 +800,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
return new SimpleEntry<Task, TaskFormData>(task, formData);
}
+ @Transactional
@Override
public WorkflowFormTO claimForm(final String taskId, final String username)
throws WorkflowException {
@@ -797,6 +826,7 @@ public class ActivitiUserWorkflowAdapter extends AbstractUserWorkflowAdapter {
return getFormTO(task, checked.getValue());
}
+ @Transactional
@Override
public WorkflowResult<UserMod> submitForm(final WorkflowFormTO form, final String username)
throws WorkflowException {
[2/5] syncope git commit: Upgrading Groovy
Posted by il...@apache.org.
Upgrading Groovy
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d5061bc3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d5061bc3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d5061bc3
Branch: refs/heads/master
Commit: d5061bc3db33c32d721f97e6914d02344c44475e
Parents: 35d148c
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Nov 28 15:44:41 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Nov 28 15:44:41 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d5061bc3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index da248ef..e0aa680 100644
--- a/pom.xml
+++ b/pom.xml
@@ -343,7 +343,7 @@ under the License.
<wicket.version>6.18.0</wicket.version>
- <groovy.version>2.3.6</groovy.version>
+ <groovy.version>2.3.8</groovy.version>
<h2.version>1.4.182</h2.version>
[5/5] syncope git commit: Merge branch '1_2_X'
Posted by il...@apache.org.
Merge branch '1_2_X'
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9ec53649
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9ec53649
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9ec53649
Branch: refs/heads/master
Commit: 9ec5364939685af63bc24f881154ed50b9dc3e45
Parents: d8b6f4b e414b79
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Nov 28 18:18:10 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Nov 28 18:18:10 2014 +0100
----------------------------------------------------------------------
.../activiti/ActivitiUserWorkflowAdapter.java | 36 ++++++++++++++++++--
pom.xml | 2 +-
2 files changed, 34 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/9ec53649/pom.xml
----------------------------------------------------------------------