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 2017/01/31 16:31:24 UTC
[1/6] syncope git commit: Upgrading Swagger UI
Repository: syncope
Updated Branches:
refs/heads/2_0_X a9dd8cc16 -> 79418c693
refs/heads/master b812f8db1 -> d80e02334
Upgrading Swagger UI
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9707b205
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9707b205
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9707b205
Branch: refs/heads/2_0_X
Commit: 9707b205499d421da0cc89be5da98e75cc5c05cc
Parents: a9dd8cc
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Jan 31 17:00:43 2017 +0100
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Jan 31 17:00:43 2017 +0100
----------------------------------------------------------------------
.../src/main/resources/META-INF/resources/swagger/index.html | 4 +++-
pom.xml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/9707b205/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
----------------------------------------------------------------------
diff --git a/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html b/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
index 3a033c9..6df05db 100644
--- a/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
+++ b/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
@@ -20,6 +20,7 @@ under the License.
<html>
<head>
<meta charset="UTF-8">
+ <meta http-equiv="x-ua-compatible" content="IE=edge">
<!-- <ApacheSyncope -->
<!--<title>Swagger UI</title>-->
<title>Swagger UI - Apache Syncope ${syncope.version}</title>
@@ -102,7 +103,8 @@ under the License.
docExpansion: "none",
jsonEditor: false,
defaultModelRendering: 'schema',
- showRequestHeaders: false
+ showRequestHeaders: false,
+ showOperationIds: false
});
// <ApacheSyncope>
http://git-wip-us.apache.org/repos/asf/syncope/blob/9707b205/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3dd51fc..2a40497 100644
--- a/pom.xml
+++ b/pom.xml
@@ -403,7 +403,7 @@ under the License.
<activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
<swagger-core.version>1.5.10</swagger-core.version>
- <swagger-ui.version>2.2.8</swagger-ui.version>
+ <swagger-ui.version>2.2.10</swagger-ui.version>
<jquery.version>2.2.4</jquery.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
[3/6] syncope git commit: [SYNCOPE-1003] Missing traslations provided
Posted by il...@apache.org.
[SYNCOPE-1003] Missing traslations provided
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/79418c69
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/79418c69
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/79418c69
Branch: refs/heads/2_0_X
Commit: 79418c693dd5308c6d7ca00c96e1fdf1f24c5320
Parents: c3458e4
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Jan 31 17:25:48 2017 +0100
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Jan 31 17:25:48 2017 +0100
----------------------------------------------------------------------
.../MailTemplateDirectoryPanel.java | 2 +-
.../NotificationDirectoryPanel.java | 12 ++++-----
.../console/panels/SecurityQuestionsPanel.java | 4 +--
.../panels/TypeExtensionDirectoryPanel.java | 2 +-
.../policies/AccountPolicyDirectoryPanel.java | 6 ++---
.../policies/PasswordPolicyDirectoryPanel.java | 4 +--
.../console/policies/PolicyDirectoryPanel.java | 8 +++---
.../policies/PolicyRuleDirectoryPanel.java | 4 +--
.../console/reports/ReportDirectoryPanel.java | 16 ++++++------
.../reports/ReportTemplateDirectoryPanel.java | 2 +-
.../reports/ReportletDirectoryPanel.java | 4 +--
.../console/status/AnyStatusDirectoryPanel.java | 6 ++---
.../status/ResourceStatusDirectoryPanel.java | 6 ++---
.../tasks/NotificationTaskDirectoryPanel.java | 14 +++++-----
.../tasks/PropagationTaskDirectoryPanel.java | 18 ++++++-------
.../tasks/ProvisioningTaskDirectoryPanel.java | 16 ++++++------
.../console/tasks/SchedTaskDirectoryPanel.java | 18 ++++++-------
.../notifications/NotificationTasks.properties | 26 +++++++++++++++++++
.../NotificationTasks_it.properties | 26 +++++++++++++++++++
.../NotificationTasks_pt_BR.properties | 26 +++++++++++++++++++
.../NotificationTasks_ru.properties | 27 ++++++++++++++++++++
21 files changed, 176 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
index e3c3f0a..ba1bfd5 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
@@ -110,7 +110,7 @@ public class MailTemplateDirectoryPanel
protected List<IColumn<MailTemplateTO, String>> getColumns() {
List<IColumn<MailTemplateTO, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<MailTemplateTO, String>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new ActionColumn<MailTemplateTO, String>(new ResourceModel("actions", "")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java
index 51f2616..c6de77f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java
@@ -88,17 +88,17 @@ public class NotificationDirectoryPanel
protected List<IColumn<NotificationTO, String>> getColumns() {
List<IColumn<NotificationTO, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<NotificationTO>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<NotificationTO, String>(
- new StringResourceModel("sender", this, null), "sender", "sender"));
+ new StringResourceModel("sender", this), "sender", "sender"));
columns.add(new PropertyColumn<NotificationTO, String>(
- new StringResourceModel("subject", this, null), "subject", "subject"));
+ new StringResourceModel("subject", this), "subject", "subject"));
columns.add(new PropertyColumn<NotificationTO, String>(
- new StringResourceModel("template", this, null), "template", "template"));
+ new StringResourceModel("template", this), "template", "template"));
columns.add(new CollectionPropertyColumn<NotificationTO>(
- new StringResourceModel("events", this, null), "events", "events"));
+ new StringResourceModel("events", this), "events", "events"));
columns.add(new BooleanPropertyColumn<NotificationTO>(
- new StringResourceModel("active", this, null), "active", "active"));
+ new StringResourceModel("active", this), "active", "active"));
columns.add(new ActionColumn<NotificationTO, String>(new ResourceModel("actions", "")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java
index bc6a3b1..a86c0ed 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java
@@ -117,10 +117,10 @@ public class SecurityQuestionsPanel extends DirectoryPanel<
List<IColumn<SecurityQuestionTO, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<SecurityQuestionTO>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<SecurityQuestionTO, String>(
- new StringResourceModel("content", this, null), "content", "content"));
+ new StringResourceModel("content", this), "content", "content"));
columns.add(new ActionColumn<SecurityQuestionTO, String>(new ResourceModel("actions")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
index 0ac39e1..6c4442f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
@@ -129,7 +129,7 @@ public class TypeExtensionDirectoryPanel
columns.add(new PropertyColumn<TypeExtensionTO, String>(
Model.of("Any Type"), "anyType", "anyType"));
columns.add(new PropertyColumn<TypeExtensionTO, String>(
- new StringResourceModel("auxClasses", this, null), "auxClasses", "auxClasses"));
+ new StringResourceModel("auxClasses", this), "auxClasses", "auxClasses"));
columns.add(new ActionColumn<TypeExtensionTO, String>(new ResourceModel("actions", "")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
index 0c5c1c2..b5f7afa 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
@@ -55,13 +55,13 @@ public class AccountPolicyDirectoryPanel extends PolicyDirectoryPanel<AccountPol
@Override
protected void addCustomColumnFields(final List<IColumn<AccountPolicyTO, String>> columns) {
columns.add(new CollectionPropertyColumn<AccountPolicyTO>(new StringResourceModel(
- "passthroughResources", this, null), "passthroughResources", "passthroughResources"));
+ "passthroughResources", this), "passthroughResources", "passthroughResources"));
columns.add(new PropertyColumn<AccountPolicyTO, String>(new StringResourceModel(
- "maxAuthenticationAttempts", this, null), "maxAuthenticationAttempts", "maxAuthenticationAttempts"));
+ "maxAuthenticationAttempts", this), "maxAuthenticationAttempts", "maxAuthenticationAttempts"));
columns.add(new BooleanPropertyColumn<AccountPolicyTO>(new StringResourceModel(
- "propagateSuspension", this, null), "propagateSuspension", "propagateSuspension"));
+ "propagateSuspension", this), "propagateSuspension", "propagateSuspension"));
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
index 2d911b6..bc16a74 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
@@ -54,10 +54,10 @@ public class PasswordPolicyDirectoryPanel extends PolicyDirectoryPanel<PasswordP
@Override
protected void addCustomColumnFields(final List<IColumn<PasswordPolicyTO, String>> columns) {
columns.add(new PropertyColumn<PasswordPolicyTO, String>(new StringResourceModel(
- "historyLength", this, null), "historyLength", "historyLength"));
+ "historyLength", this), "historyLength", "historyLength"));
columns.add(new BooleanPropertyColumn<PasswordPolicyTO>(new StringResourceModel(
- "allowNullPassword", this, null), "allowNullPassword", "allowNullPassword"));
+ "allowNullPassword", this), "allowNullPassword", "allowNullPassword"));
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
index e528168..16d0e42 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
@@ -119,16 +119,16 @@ public abstract class PolicyDirectoryPanel<T extends AbstractPolicyTO>
final List<IColumn<T, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<T>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<T, String>(new StringResourceModel(
- "description", this, null), "description", "description"));
+ "description", this), "description", "description"));
columns.add(new CollectionPropertyColumn<T>(
- new StringResourceModel("usedByResources", this, null), "usedByResources", "usedByResources"));
+ new StringResourceModel("usedByResources", this), "usedByResources", "usedByResources"));
columns.add(new CollectionPropertyColumn<T>(
- new StringResourceModel("usedByRealms", this, null), "usedByRealms", "usedByRealms"));
+ new StringResourceModel("usedByRealms", this), "usedByRealms", "usedByRealms"));
addCustomColumnFields(columns);
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
index 47248d7..2e9700d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
@@ -105,10 +105,10 @@ public class PolicyRuleDirectoryPanel<T extends AbstractPolicyTO> extends Direct
final List<IColumn<PolicyRuleWrapper, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<PolicyRuleWrapper, String>(
- new StringResourceModel("ruleConf", this, null), "name", "name"));
+ new StringResourceModel("ruleConf", this), "name", "name"));
columns.add(new AbstractColumn<PolicyRuleWrapper, String>(
- new StringResourceModel("configuration", this, null)) {
+ new StringResourceModel("configuration", this)) {
private static final long serialVersionUID = -4008579357070833846L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
index b389b6d..95cd801 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
@@ -87,28 +87,28 @@ public abstract class ReportDirectoryPanel
final List<IColumn<ReportTO, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<ReportTO>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<ReportTO, String>(new StringResourceModel(
- "name", this, null), "name", "name"));
+ "name", this), "name", "name"));
columns.add(new DatePropertyColumn<ReportTO>(
- new StringResourceModel("lastExec", this, null), "lastExec", "lastExec"));
+ new StringResourceModel("lastExec", this), "lastExec", "lastExec"));
columns.add(new DatePropertyColumn<ReportTO>(
- new StringResourceModel("nextExec", this, null), "nextExec", "nextExec"));
+ new StringResourceModel("nextExec", this), "nextExec", "nextExec"));
columns.add(new DatePropertyColumn<ReportTO>(
- new StringResourceModel("start", this, null), "start", "start"));
+ new StringResourceModel("start", this), "start", "start"));
columns.add(new DatePropertyColumn<ReportTO>(
- new StringResourceModel("end", this, null), "end", "end"));
+ new StringResourceModel("end", this), "end", "end"));
columns.add(new PropertyColumn<ReportTO, String>(
- new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
+ new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus"));
columns.add(new BooleanPropertyColumn<ReportTO>(
- new StringResourceModel("active", this, null), "active", "active"));
+ new StringResourceModel("active", this), "active", "active"));
columns.add(new ActionColumn<ReportTO, String>(new ResourceModel("actions")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
index 7621b11..d89ac22 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
@@ -112,7 +112,7 @@ public class ReportTemplateDirectoryPanel
protected List<IColumn<ReportTemplateTO, String>> getColumns() {
List<IColumn<ReportTemplateTO, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<ReportTemplateTO, String>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new ActionColumn<ReportTemplateTO, String>(new ResourceModel("actions", "")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
index 7968fe5..cf33051 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
@@ -107,10 +107,10 @@ public class ReportletDirectoryPanel extends DirectoryPanel<
final List<IColumn<ReportletWrapper, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<ReportletWrapper, String>(
- new StringResourceModel("reportlet", this, null), "name", "name"));
+ new StringResourceModel("reportlet", this), "name", "name"));
columns.add(new AbstractColumn<ReportletWrapper, String>(
- new StringResourceModel("configuration", this, null)) {
+ new StringResourceModel("configuration", this)) {
private static final long serialVersionUID = -4008579357070833846L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
index 8699a42..fee2de8 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
@@ -105,7 +105,7 @@ public class AnyStatusDirectoryPanel
final List<IColumn<StatusBean, String>> columns = new ArrayList<>();
columns.add(new AbstractColumn<StatusBean, String>(
- new StringResourceModel("resourceName", this, null), "resourceName") {
+ new StringResourceModel("resourceName", this), "resourceName") {
private static final long serialVersionUID = 2054811145491901166L;
@@ -132,9 +132,9 @@ public class AnyStatusDirectoryPanel
});
columns.add(new PropertyColumn<StatusBean, String>(
- new StringResourceModel("connObjectLink", this, null), "connObjectLink", "connObjectLink"));
+ new StringResourceModel("connObjectLink", this), "connObjectLink", "connObjectLink"));
- columns.add(new AbstractColumn<StatusBean, String>(new StringResourceModel("status", this, null)) {
+ columns.add(new AbstractColumn<StatusBean, String>(new StringResourceModel("status", this)) {
private static final long serialVersionUID = -3503023501954863131L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
index 95bc50a..93a0ffa 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
@@ -89,12 +89,12 @@ public class ResourceStatusDirectoryPanel
final List<IColumn<StatusBean, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<StatusBean, String>(
- new StringResourceModel("anyKey", this, null), "anyKey", "anyKey"));
+ new StringResourceModel("anyKey", this), "anyKey", "anyKey"));
columns.add(new PropertyColumn<StatusBean, String>(
- new StringResourceModel("connObjectLink", this, null), "connObjectLink", "connObjectLink"));
+ new StringResourceModel("connObjectLink", this), "connObjectLink", "connObjectLink"));
- columns.add(new AbstractColumn<StatusBean, String>(new StringResourceModel("status", this, null)) {
+ columns.add(new AbstractColumn<StatusBean, String>(new StringResourceModel("status", this)) {
private static final long serialVersionUID = -3503023501954863131L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
index 3aeff11..1c09fe4 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
@@ -84,25 +84,25 @@ public abstract class NotificationTaskDirectoryPanel
final List<IColumn<NotificationTaskTO, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<NotificationTaskTO>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<NotificationTaskTO, String>(
- new StringResourceModel("sender", this, null), "sender", "sender"));
+ new StringResourceModel("sender", this), "sender", "sender"));
columns.add(new PropertyColumn<NotificationTaskTO, String>(
- new StringResourceModel("subject", this, null), "subject", "subject"));
+ new StringResourceModel("subject", this), "subject", "subject"));
columns.add(new CollectionPropertyColumn<NotificationTaskTO>(
- new StringResourceModel("recipients", this, null), "recipients", "recipients"));
+ new StringResourceModel("recipients", this), "recipients", "recipients"));
columns.add(new DatePropertyColumn<NotificationTaskTO>(
- new StringResourceModel("start", this, null), "start", "start"));
+ new StringResourceModel("start", this), "start", "start"));
columns.add(new DatePropertyColumn<NotificationTaskTO>(
- new StringResourceModel("end", this, null), "end", "end"));
+ new StringResourceModel("end", this), "end", "end"));
columns.add(new PropertyColumn<NotificationTaskTO, String>(
- new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
+ new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus"));
columns.add(new ActionColumn<NotificationTaskTO, String>(new ResourceModel("actions", "")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
index a8e3f9a..d5ddce0 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
@@ -75,33 +75,33 @@ public abstract class PropagationTaskDirectoryPanel
final List<IColumn<PropagationTaskTO, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<PropagationTaskTO>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<PropagationTaskTO, String>(new StringResourceModel(
- "operation", this, null), "operation", "operation"));
+ "operation", this), "operation", "operation"));
if (resource == null) {
columns.add(new PropertyColumn<PropagationTaskTO, String>(new StringResourceModel(
- "resource", this, null), "resource", "resource"));
+ "resource", this), "resource", "resource"));
} else {
columns.add(new PropertyColumn<PropagationTaskTO, String>(
- new StringResourceModel("anyTypeKind", this, null), "anyTypeKind", "anyTypeKind"));
+ new StringResourceModel("anyTypeKind", this), "anyTypeKind", "anyTypeKind"));
}
columns.add(new PropertyColumn<PropagationTaskTO, String>(
- new StringResourceModel("entityKey", this, null), "entityKey", "entityKey"));
+ new StringResourceModel("entityKey", this), "entityKey", "entityKey"));
columns.add(new PropertyColumn<PropagationTaskTO, String>(
- new StringResourceModel("connObjectKey", this, null), "connObjectKey", "connObjectKey"));
+ new StringResourceModel("connObjectKey", this), "connObjectKey", "connObjectKey"));
columns.add(new DatePropertyColumn<PropagationTaskTO>(
- new StringResourceModel("start", this, null), "start", "start"));
+ new StringResourceModel("start", this), "start", "start"));
columns.add(new DatePropertyColumn<PropagationTaskTO>(
- new StringResourceModel("end", this, null), "end", "end"));
+ new StringResourceModel("end", this), "end", "end"));
columns.add(new PropertyColumn<PropagationTaskTO, String>(
- new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
+ new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus"));
columns.add(new ActionColumn<PropagationTaskTO, String>(new ResourceModel("actions")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
index 0c36f0a..75b5efd 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
@@ -72,30 +72,30 @@ public abstract class ProvisioningTaskDirectoryPanel<T extends AbstractProvision
List<IColumn<T, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<T>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<T, String>(
- new StringResourceModel("name", this, null), "name", "name"));
+ new StringResourceModel("name", this), "name", "name"));
columns.add(new PropertyColumn<T, String>(
- new StringResourceModel("description", this, null), "description", "description"));
+ new StringResourceModel("description", this), "description", "description"));
if (reference == PullTaskTO.class) {
columns.add(new PropertyColumn<T, String>(
- new StringResourceModel("destinationRealm", this, null), "destinationRealm", "destinationRealm"));
+ new StringResourceModel("destinationRealm", this), "destinationRealm", "destinationRealm"));
}
columns.add(new DatePropertyColumn<T>(
- new StringResourceModel("lastExec", this, null), "lastExec", "lastExec"));
+ new StringResourceModel("lastExec", this), "lastExec", "lastExec"));
columns.add(new DatePropertyColumn<T>(
- new StringResourceModel("nextExec", this, null), "nextExec", "nextExec"));
+ new StringResourceModel("nextExec", this), "nextExec", "nextExec"));
columns.add(new PropertyColumn<T, String>(
- new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
+ new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus"));
columns.add(new BooleanPropertyColumn<T>(
- new StringResourceModel("active", this, null), "active", "active"));
+ new StringResourceModel("active", this), "active", "active"));
return columns;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
index 2142785..b43a346 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
@@ -74,8 +74,8 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO>
private static final long serialVersionUID = 4984337552918213290L;
- private static final String GROUP_MEMBER_PROVISION_TASKJOB
- = "org.apache.syncope.core.provisioning.java.job.GroupMemberProvisionTaskJobDelegate";
+ private static final String GROUP_MEMBER_PROVISION_TASKJOB =
+ "org.apache.syncope.core.provisioning.java.job.GroupMemberProvisionTaskJobDelegate";
protected final Class<T> reference;
@@ -131,13 +131,13 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO>
final List<IColumn<T, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<T>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<T, String>(
- new StringResourceModel("name", this, null), "name", "name"));
+ new StringResourceModel("name", this), "name", "name"));
columns.add(new PropertyColumn<T, String>(new StringResourceModel(
- "jobDelegateClassName", this, null), "jobDelegateClassName", "jobDelegateClassName") {
+ "jobDelegateClassName", this), "jobDelegateClassName", "jobDelegateClassName") {
private static final long serialVersionUID = -3223917055078733093L;
@@ -160,16 +160,16 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO>
});
columns.add(new DatePropertyColumn<T>(
- new StringResourceModel("lastExec", this, null), "lastExec", "lastExec"));
+ new StringResourceModel("lastExec", this), "lastExec", "lastExec"));
columns.add(new DatePropertyColumn<T>(
- new StringResourceModel("nextExec", this, null), "nextExec", "nextExec"));
+ new StringResourceModel("nextExec", this), "nextExec", "nextExec"));
columns.add(new PropertyColumn<T, String>(
- new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
+ new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus"));
columns.add(new BooleanPropertyColumn<T>(
- new StringResourceModel("active", this, null), "active", "active"));
+ new StringResourceModel("active", this), "active", "active"));
return columns;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks.properties
new file mode 100644
index 0000000..744f9a1
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks.properties
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+sender=Sender
+template=Template
+traceLevel=Trace level
+notification=Notification
+about=About
+events=Events
+selfAsRecipient=Include users matching About
+checkRecipients=Search recipients
+isActive=Enabled
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_it.properties
new file mode 100644
index 0000000..e4f3e2c
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_it.properties
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+sender=Mittente
+template=Modello
+traceLevel=Livello di tracciamento
+notification=Notifica
+about=Soggetti
+events=Eventi
+selfAsRecipient=Includi i soggetti
+checkRecipients=Cerca i destinatari
+isActive=Abilitata
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_pt_BR.properties
new file mode 100644
index 0000000..be1304e
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_pt_BR.properties
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+sender=Remetente
+template=Template
+traceLevel=N\u00edvel de Trace
+notification=Notifica\u00e7\u00e3o
+about=Sobre
+events=Eventos
+selfAsRecipient=Incluir usu\u00e1rios relacionados Sobre
+checkRecipients=Buscar Destinat\u00e1rios
+isActive=Ativada
http://git-wip-us.apache.org/repos/asf/syncope/blob/79418c69/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_ru.properties
new file mode 100644
index 0000000..15b5c03
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_ru.properties
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
+sender=\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u0435\u043b\u044c
+template=\u0428\u0430\u0431\u043b\u043e\u043d
+traceLevel=\u041b\u043e\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
+notification=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435
+about=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u043e
+events=\u0421\u043e\u0431\u044b\u0442\u0438\u044f
+selfAsRecipient=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0432 \u043f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439, \u043e \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0440\u0430\u0441\u0441\u044b\u043b\u0430\u0435\u0442\u0441\u044f \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435
+checkRecipients=\u041f\u043e\u0438\u0441\u043a \u043f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0435\u0439
+isActive=\u0410\u043a\u0442\u0438\u0432\u043d\u043e
[4/6] syncope git commit: Upgrading Swagger UI
Posted by il...@apache.org.
Upgrading Swagger UI
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/07b12385
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/07b12385
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/07b12385
Branch: refs/heads/master
Commit: 07b12385b9f6875f5d29c962a6088baf2c9a6f4f
Parents: b812f8d
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Jan 31 17:00:43 2017 +0100
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Jan 31 17:29:05 2017 +0100
----------------------------------------------------------------------
.../src/main/resources/META-INF/resources/swagger/index.html | 4 +++-
pom.xml | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/07b12385/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
----------------------------------------------------------------------
diff --git a/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html b/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
index 3a033c9..6df05db 100644
--- a/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
+++ b/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
@@ -20,6 +20,7 @@ under the License.
<html>
<head>
<meta charset="UTF-8">
+ <meta http-equiv="x-ua-compatible" content="IE=edge">
<!-- <ApacheSyncope -->
<!--<title>Swagger UI</title>-->
<title>Swagger UI - Apache Syncope ${syncope.version}</title>
@@ -102,7 +103,8 @@ under the License.
docExpansion: "none",
jsonEditor: false,
defaultModelRendering: 'schema',
- showRequestHeaders: false
+ showRequestHeaders: false,
+ showOperationIds: false
});
// <ApacheSyncope>
http://git-wip-us.apache.org/repos/asf/syncope/blob/07b12385/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 96c9cd6..ede31d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -403,7 +403,7 @@ under the License.
<activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
<swagger-core.version>1.5.12</swagger-core.version>
- <swagger-ui.version>2.2.8</swagger-ui.version>
+ <swagger-ui.version>2.2.10</swagger-ui.version>
<jquery.version>2.2.4</jquery.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
[5/6] syncope git commit: [SYNCOPE-1004] Now managing selfRead() too
Posted by il...@apache.org.
[SYNCOPE-1004] Now managing selfRead() too
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8df515ec
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8df515ec
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8df515ec
Branch: refs/heads/master
Commit: 8df515ecf485aa342b5b3098a78e23ea8a2c18f3
Parents: 07b1238
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Jan 31 17:25:22 2017 +0100
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Jan 31 17:29:12 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/syncope/core/logic/UserLogic.java | 2 +-
.../provisioning/java/notification/NotificationManagerImpl.java | 5 +++++
.../syncope/core/rest/cxf/service/UserSelfServiceImpl.java | 4 ++--
.../src/test/java/org/apache/syncope/fit/core/ReportITCase.java | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/8df515ec/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
index b5a41da..f51fdb6 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
@@ -115,7 +115,7 @@ public class UserLogic extends AbstractAnyLogic<UserTO, UserPatch> {
@PreAuthorize("isAuthenticated()")
@Transactional(readOnly = true)
- public Pair<String, UserTO> readSelf() {
+ public Pair<String, UserTO> selfRead() {
return ImmutablePair.of(
POJOHelper.serialize(AuthContextUtils.getAuthorizations()),
binder.returnUserTO(binder.getAuthenticatedUserTO()));
http://git-wip-us.apache.org/repos/asf/syncope/blob/8df515ec/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
index 6248185..1a021ae 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.jexl3.MapContext;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.UserTO;
import org.apache.syncope.common.lib.types.AuditElements;
@@ -270,6 +271,10 @@ public class NotificationManagerImpl implements NotificationManager {
any = userDAO.find(((UserTO) before).getKey());
} else if (output instanceof UserTO) {
any = userDAO.find(((UserTO) output).getKey());
+ } else if (output instanceof Pair
+ && ((Pair) output).getRight() instanceof UserTO) {
+
+ any = userDAO.find(((UserTO) ((Pair) output).getRight()).getKey());
} else if (output instanceof ProvisioningResult
&& ((ProvisioningResult) output).getEntity() instanceof UserTO) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/8df515ec/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/UserSelfServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/UserSelfServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/UserSelfServiceImpl.java
index 3ccfd82..c76986e 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/UserSelfServiceImpl.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/UserSelfServiceImpl.java
@@ -56,7 +56,7 @@ public class UserSelfServiceImpl extends AbstractServiceImpl implements UserSelf
@Override
public Response read() {
- Pair<String, UserTO> self = logic.readSelf();
+ Pair<String, UserTO> self = logic.selfRead();
return Response.ok().
header(RESTHeaders.RESOURCE_KEY, self.getValue().getKey()).
header(RESTHeaders.OWNED_ENTITLEMENTS, self.getKey()).
@@ -72,7 +72,7 @@ public class UserSelfServiceImpl extends AbstractServiceImpl implements UserSelf
@Override
public Response update(final UserTO user) {
- Pair<String, UserTO> self = logic.readSelf();
+ Pair<String, UserTO> self = logic.selfRead();
return update(AnyOperations.diff(user, self.getValue(), false));
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8df515ec/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportITCase.java
index 4dc4663..57ba47e 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportITCase.java
@@ -257,7 +257,7 @@ public class ReportITCase extends AbstractITCase {
AuditElements.EventCategoryType.LOGIC,
"UserLogic",
null,
- "readSelf",
+ "selfRead",
AuditElements.Result.SUCCESS);
try {
[6/6] syncope git commit: [SYNCOPE-1003] Missing traslations provided
Posted by il...@apache.org.
[SYNCOPE-1003] Missing traslations provided
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d80e0233
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d80e0233
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d80e0233
Branch: refs/heads/master
Commit: d80e02334de47b7b1c9bb738f1f66b70d2826780
Parents: 8df515e
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Jan 31 17:25:48 2017 +0100
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Jan 31 17:29:16 2017 +0100
----------------------------------------------------------------------
.../MailTemplateDirectoryPanel.java | 2 +-
.../NotificationDirectoryPanel.java | 12 ++++-----
.../console/panels/SecurityQuestionsPanel.java | 4 +--
.../panels/TypeExtensionDirectoryPanel.java | 2 +-
.../policies/AccountPolicyDirectoryPanel.java | 6 ++---
.../policies/PasswordPolicyDirectoryPanel.java | 4 +--
.../console/policies/PolicyDirectoryPanel.java | 8 +++---
.../policies/PolicyRuleDirectoryPanel.java | 4 +--
.../console/reports/ReportDirectoryPanel.java | 16 ++++++------
.../reports/ReportTemplateDirectoryPanel.java | 2 +-
.../reports/ReportletDirectoryPanel.java | 4 +--
.../console/status/AnyStatusDirectoryPanel.java | 6 ++---
.../status/ResourceStatusDirectoryPanel.java | 6 ++---
.../tasks/NotificationTaskDirectoryPanel.java | 14 +++++-----
.../tasks/PropagationTaskDirectoryPanel.java | 18 ++++++-------
.../tasks/ProvisioningTaskDirectoryPanel.java | 16 ++++++------
.../console/tasks/SchedTaskDirectoryPanel.java | 18 ++++++-------
.../notifications/NotificationTasks.properties | 26 +++++++++++++++++++
.../NotificationTasks_it.properties | 26 +++++++++++++++++++
.../NotificationTasks_pt_BR.properties | 26 +++++++++++++++++++
.../NotificationTasks_ru.properties | 27 ++++++++++++++++++++
21 files changed, 176 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
index e3c3f0a..ba1bfd5 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
@@ -110,7 +110,7 @@ public class MailTemplateDirectoryPanel
protected List<IColumn<MailTemplateTO, String>> getColumns() {
List<IColumn<MailTemplateTO, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<MailTemplateTO, String>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new ActionColumn<MailTemplateTO, String>(new ResourceModel("actions", "")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java
index 51f2616..c6de77f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java
@@ -88,17 +88,17 @@ public class NotificationDirectoryPanel
protected List<IColumn<NotificationTO, String>> getColumns() {
List<IColumn<NotificationTO, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<NotificationTO>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<NotificationTO, String>(
- new StringResourceModel("sender", this, null), "sender", "sender"));
+ new StringResourceModel("sender", this), "sender", "sender"));
columns.add(new PropertyColumn<NotificationTO, String>(
- new StringResourceModel("subject", this, null), "subject", "subject"));
+ new StringResourceModel("subject", this), "subject", "subject"));
columns.add(new PropertyColumn<NotificationTO, String>(
- new StringResourceModel("template", this, null), "template", "template"));
+ new StringResourceModel("template", this), "template", "template"));
columns.add(new CollectionPropertyColumn<NotificationTO>(
- new StringResourceModel("events", this, null), "events", "events"));
+ new StringResourceModel("events", this), "events", "events"));
columns.add(new BooleanPropertyColumn<NotificationTO>(
- new StringResourceModel("active", this, null), "active", "active"));
+ new StringResourceModel("active", this), "active", "active"));
columns.add(new ActionColumn<NotificationTO, String>(new ResourceModel("actions", "")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java
index bc6a3b1..a86c0ed 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java
@@ -117,10 +117,10 @@ public class SecurityQuestionsPanel extends DirectoryPanel<
List<IColumn<SecurityQuestionTO, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<SecurityQuestionTO>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<SecurityQuestionTO, String>(
- new StringResourceModel("content", this, null), "content", "content"));
+ new StringResourceModel("content", this), "content", "content"));
columns.add(new ActionColumn<SecurityQuestionTO, String>(new ResourceModel("actions")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
index 0ac39e1..6c4442f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java
@@ -129,7 +129,7 @@ public class TypeExtensionDirectoryPanel
columns.add(new PropertyColumn<TypeExtensionTO, String>(
Model.of("Any Type"), "anyType", "anyType"));
columns.add(new PropertyColumn<TypeExtensionTO, String>(
- new StringResourceModel("auxClasses", this, null), "auxClasses", "auxClasses"));
+ new StringResourceModel("auxClasses", this), "auxClasses", "auxClasses"));
columns.add(new ActionColumn<TypeExtensionTO, String>(new ResourceModel("actions", "")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
index 0c5c1c2..b5f7afa 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
@@ -55,13 +55,13 @@ public class AccountPolicyDirectoryPanel extends PolicyDirectoryPanel<AccountPol
@Override
protected void addCustomColumnFields(final List<IColumn<AccountPolicyTO, String>> columns) {
columns.add(new CollectionPropertyColumn<AccountPolicyTO>(new StringResourceModel(
- "passthroughResources", this, null), "passthroughResources", "passthroughResources"));
+ "passthroughResources", this), "passthroughResources", "passthroughResources"));
columns.add(new PropertyColumn<AccountPolicyTO, String>(new StringResourceModel(
- "maxAuthenticationAttempts", this, null), "maxAuthenticationAttempts", "maxAuthenticationAttempts"));
+ "maxAuthenticationAttempts", this), "maxAuthenticationAttempts", "maxAuthenticationAttempts"));
columns.add(new BooleanPropertyColumn<AccountPolicyTO>(new StringResourceModel(
- "propagateSuspension", this, null), "propagateSuspension", "propagateSuspension"));
+ "propagateSuspension", this), "propagateSuspension", "propagateSuspension"));
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
index 2d911b6..bc16a74 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
@@ -54,10 +54,10 @@ public class PasswordPolicyDirectoryPanel extends PolicyDirectoryPanel<PasswordP
@Override
protected void addCustomColumnFields(final List<IColumn<PasswordPolicyTO, String>> columns) {
columns.add(new PropertyColumn<PasswordPolicyTO, String>(new StringResourceModel(
- "historyLength", this, null), "historyLength", "historyLength"));
+ "historyLength", this), "historyLength", "historyLength"));
columns.add(new BooleanPropertyColumn<PasswordPolicyTO>(new StringResourceModel(
- "allowNullPassword", this, null), "allowNullPassword", "allowNullPassword"));
+ "allowNullPassword", this), "allowNullPassword", "allowNullPassword"));
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
index e528168..16d0e42 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
@@ -119,16 +119,16 @@ public abstract class PolicyDirectoryPanel<T extends AbstractPolicyTO>
final List<IColumn<T, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<T>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<T, String>(new StringResourceModel(
- "description", this, null), "description", "description"));
+ "description", this), "description", "description"));
columns.add(new CollectionPropertyColumn<T>(
- new StringResourceModel("usedByResources", this, null), "usedByResources", "usedByResources"));
+ new StringResourceModel("usedByResources", this), "usedByResources", "usedByResources"));
columns.add(new CollectionPropertyColumn<T>(
- new StringResourceModel("usedByRealms", this, null), "usedByRealms", "usedByRealms"));
+ new StringResourceModel("usedByRealms", this), "usedByRealms", "usedByRealms"));
addCustomColumnFields(columns);
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
index 47248d7..2e9700d 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleDirectoryPanel.java
@@ -105,10 +105,10 @@ public class PolicyRuleDirectoryPanel<T extends AbstractPolicyTO> extends Direct
final List<IColumn<PolicyRuleWrapper, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<PolicyRuleWrapper, String>(
- new StringResourceModel("ruleConf", this, null), "name", "name"));
+ new StringResourceModel("ruleConf", this), "name", "name"));
columns.add(new AbstractColumn<PolicyRuleWrapper, String>(
- new StringResourceModel("configuration", this, null)) {
+ new StringResourceModel("configuration", this)) {
private static final long serialVersionUID = -4008579357070833846L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
index b389b6d..95cd801 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java
@@ -87,28 +87,28 @@ public abstract class ReportDirectoryPanel
final List<IColumn<ReportTO, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<ReportTO>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<ReportTO, String>(new StringResourceModel(
- "name", this, null), "name", "name"));
+ "name", this), "name", "name"));
columns.add(new DatePropertyColumn<ReportTO>(
- new StringResourceModel("lastExec", this, null), "lastExec", "lastExec"));
+ new StringResourceModel("lastExec", this), "lastExec", "lastExec"));
columns.add(new DatePropertyColumn<ReportTO>(
- new StringResourceModel("nextExec", this, null), "nextExec", "nextExec"));
+ new StringResourceModel("nextExec", this), "nextExec", "nextExec"));
columns.add(new DatePropertyColumn<ReportTO>(
- new StringResourceModel("start", this, null), "start", "start"));
+ new StringResourceModel("start", this), "start", "start"));
columns.add(new DatePropertyColumn<ReportTO>(
- new StringResourceModel("end", this, null), "end", "end"));
+ new StringResourceModel("end", this), "end", "end"));
columns.add(new PropertyColumn<ReportTO, String>(
- new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
+ new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus"));
columns.add(new BooleanPropertyColumn<ReportTO>(
- new StringResourceModel("active", this, null), "active", "active"));
+ new StringResourceModel("active", this), "active", "active"));
columns.add(new ActionColumn<ReportTO, String>(new ResourceModel("actions")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
index 7621b11..d89ac22 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
@@ -112,7 +112,7 @@ public class ReportTemplateDirectoryPanel
protected List<IColumn<ReportTemplateTO, String>> getColumns() {
List<IColumn<ReportTemplateTO, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<ReportTemplateTO, String>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new ActionColumn<ReportTemplateTO, String>(new ResourceModel("actions", "")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
index 7968fe5..cf33051 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
@@ -107,10 +107,10 @@ public class ReportletDirectoryPanel extends DirectoryPanel<
final List<IColumn<ReportletWrapper, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<ReportletWrapper, String>(
- new StringResourceModel("reportlet", this, null), "name", "name"));
+ new StringResourceModel("reportlet", this), "name", "name"));
columns.add(new AbstractColumn<ReportletWrapper, String>(
- new StringResourceModel("configuration", this, null)) {
+ new StringResourceModel("configuration", this)) {
private static final long serialVersionUID = -4008579357070833846L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
index 8699a42..fee2de8 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java
@@ -105,7 +105,7 @@ public class AnyStatusDirectoryPanel
final List<IColumn<StatusBean, String>> columns = new ArrayList<>();
columns.add(new AbstractColumn<StatusBean, String>(
- new StringResourceModel("resourceName", this, null), "resourceName") {
+ new StringResourceModel("resourceName", this), "resourceName") {
private static final long serialVersionUID = 2054811145491901166L;
@@ -132,9 +132,9 @@ public class AnyStatusDirectoryPanel
});
columns.add(new PropertyColumn<StatusBean, String>(
- new StringResourceModel("connObjectLink", this, null), "connObjectLink", "connObjectLink"));
+ new StringResourceModel("connObjectLink", this), "connObjectLink", "connObjectLink"));
- columns.add(new AbstractColumn<StatusBean, String>(new StringResourceModel("status", this, null)) {
+ columns.add(new AbstractColumn<StatusBean, String>(new StringResourceModel("status", this)) {
private static final long serialVersionUID = -3503023501954863131L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
index 95bc50a..93a0ffa 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
@@ -89,12 +89,12 @@ public class ResourceStatusDirectoryPanel
final List<IColumn<StatusBean, String>> columns = new ArrayList<>();
columns.add(new PropertyColumn<StatusBean, String>(
- new StringResourceModel("anyKey", this, null), "anyKey", "anyKey"));
+ new StringResourceModel("anyKey", this), "anyKey", "anyKey"));
columns.add(new PropertyColumn<StatusBean, String>(
- new StringResourceModel("connObjectLink", this, null), "connObjectLink", "connObjectLink"));
+ new StringResourceModel("connObjectLink", this), "connObjectLink", "connObjectLink"));
- columns.add(new AbstractColumn<StatusBean, String>(new StringResourceModel("status", this, null)) {
+ columns.add(new AbstractColumn<StatusBean, String>(new StringResourceModel("status", this)) {
private static final long serialVersionUID = -3503023501954863131L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
index 3aeff11..1c09fe4 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
@@ -84,25 +84,25 @@ public abstract class NotificationTaskDirectoryPanel
final List<IColumn<NotificationTaskTO, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<NotificationTaskTO>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<NotificationTaskTO, String>(
- new StringResourceModel("sender", this, null), "sender", "sender"));
+ new StringResourceModel("sender", this), "sender", "sender"));
columns.add(new PropertyColumn<NotificationTaskTO, String>(
- new StringResourceModel("subject", this, null), "subject", "subject"));
+ new StringResourceModel("subject", this), "subject", "subject"));
columns.add(new CollectionPropertyColumn<NotificationTaskTO>(
- new StringResourceModel("recipients", this, null), "recipients", "recipients"));
+ new StringResourceModel("recipients", this), "recipients", "recipients"));
columns.add(new DatePropertyColumn<NotificationTaskTO>(
- new StringResourceModel("start", this, null), "start", "start"));
+ new StringResourceModel("start", this), "start", "start"));
columns.add(new DatePropertyColumn<NotificationTaskTO>(
- new StringResourceModel("end", this, null), "end", "end"));
+ new StringResourceModel("end", this), "end", "end"));
columns.add(new PropertyColumn<NotificationTaskTO, String>(
- new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
+ new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus"));
columns.add(new ActionColumn<NotificationTaskTO, String>(new ResourceModel("actions", "")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
index a8e3f9a..d5ddce0 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
@@ -75,33 +75,33 @@ public abstract class PropagationTaskDirectoryPanel
final List<IColumn<PropagationTaskTO, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<PropagationTaskTO>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<PropagationTaskTO, String>(new StringResourceModel(
- "operation", this, null), "operation", "operation"));
+ "operation", this), "operation", "operation"));
if (resource == null) {
columns.add(new PropertyColumn<PropagationTaskTO, String>(new StringResourceModel(
- "resource", this, null), "resource", "resource"));
+ "resource", this), "resource", "resource"));
} else {
columns.add(new PropertyColumn<PropagationTaskTO, String>(
- new StringResourceModel("anyTypeKind", this, null), "anyTypeKind", "anyTypeKind"));
+ new StringResourceModel("anyTypeKind", this), "anyTypeKind", "anyTypeKind"));
}
columns.add(new PropertyColumn<PropagationTaskTO, String>(
- new StringResourceModel("entityKey", this, null), "entityKey", "entityKey"));
+ new StringResourceModel("entityKey", this), "entityKey", "entityKey"));
columns.add(new PropertyColumn<PropagationTaskTO, String>(
- new StringResourceModel("connObjectKey", this, null), "connObjectKey", "connObjectKey"));
+ new StringResourceModel("connObjectKey", this), "connObjectKey", "connObjectKey"));
columns.add(new DatePropertyColumn<PropagationTaskTO>(
- new StringResourceModel("start", this, null), "start", "start"));
+ new StringResourceModel("start", this), "start", "start"));
columns.add(new DatePropertyColumn<PropagationTaskTO>(
- new StringResourceModel("end", this, null), "end", "end"));
+ new StringResourceModel("end", this), "end", "end"));
columns.add(new PropertyColumn<PropagationTaskTO, String>(
- new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
+ new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus"));
columns.add(new ActionColumn<PropagationTaskTO, String>(new ResourceModel("actions")) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
index 0c36f0a..75b5efd 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java
@@ -72,30 +72,30 @@ public abstract class ProvisioningTaskDirectoryPanel<T extends AbstractProvision
List<IColumn<T, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<T>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<T, String>(
- new StringResourceModel("name", this, null), "name", "name"));
+ new StringResourceModel("name", this), "name", "name"));
columns.add(new PropertyColumn<T, String>(
- new StringResourceModel("description", this, null), "description", "description"));
+ new StringResourceModel("description", this), "description", "description"));
if (reference == PullTaskTO.class) {
columns.add(new PropertyColumn<T, String>(
- new StringResourceModel("destinationRealm", this, null), "destinationRealm", "destinationRealm"));
+ new StringResourceModel("destinationRealm", this), "destinationRealm", "destinationRealm"));
}
columns.add(new DatePropertyColumn<T>(
- new StringResourceModel("lastExec", this, null), "lastExec", "lastExec"));
+ new StringResourceModel("lastExec", this), "lastExec", "lastExec"));
columns.add(new DatePropertyColumn<T>(
- new StringResourceModel("nextExec", this, null), "nextExec", "nextExec"));
+ new StringResourceModel("nextExec", this), "nextExec", "nextExec"));
columns.add(new PropertyColumn<T, String>(
- new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
+ new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus"));
columns.add(new BooleanPropertyColumn<T>(
- new StringResourceModel("active", this, null), "active", "active"));
+ new StringResourceModel("active", this), "active", "active"));
return columns;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
index 2142785..b43a346 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java
@@ -74,8 +74,8 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO>
private static final long serialVersionUID = 4984337552918213290L;
- private static final String GROUP_MEMBER_PROVISION_TASKJOB
- = "org.apache.syncope.core.provisioning.java.job.GroupMemberProvisionTaskJobDelegate";
+ private static final String GROUP_MEMBER_PROVISION_TASKJOB =
+ "org.apache.syncope.core.provisioning.java.job.GroupMemberProvisionTaskJobDelegate";
protected final Class<T> reference;
@@ -131,13 +131,13 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO>
final List<IColumn<T, String>> columns = new ArrayList<>();
columns.add(new KeyPropertyColumn<T>(
- new StringResourceModel("key", this, null), "key", "key"));
+ new StringResourceModel("key", this), "key", "key"));
columns.add(new PropertyColumn<T, String>(
- new StringResourceModel("name", this, null), "name", "name"));
+ new StringResourceModel("name", this), "name", "name"));
columns.add(new PropertyColumn<T, String>(new StringResourceModel(
- "jobDelegateClassName", this, null), "jobDelegateClassName", "jobDelegateClassName") {
+ "jobDelegateClassName", this), "jobDelegateClassName", "jobDelegateClassName") {
private static final long serialVersionUID = -3223917055078733093L;
@@ -160,16 +160,16 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO>
});
columns.add(new DatePropertyColumn<T>(
- new StringResourceModel("lastExec", this, null), "lastExec", "lastExec"));
+ new StringResourceModel("lastExec", this), "lastExec", "lastExec"));
columns.add(new DatePropertyColumn<T>(
- new StringResourceModel("nextExec", this, null), "nextExec", "nextExec"));
+ new StringResourceModel("nextExec", this), "nextExec", "nextExec"));
columns.add(new PropertyColumn<T, String>(
- new StringResourceModel("latestExecStatus", this, null), "latestExecStatus", "latestExecStatus"));
+ new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus"));
columns.add(new BooleanPropertyColumn<T>(
- new StringResourceModel("active", this, null), "active", "active"));
+ new StringResourceModel("active", this), "active", "active"));
return columns;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks.properties
new file mode 100644
index 0000000..744f9a1
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks.properties
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+sender=Sender
+template=Template
+traceLevel=Trace level
+notification=Notification
+about=About
+events=Events
+selfAsRecipient=Include users matching About
+checkRecipients=Search recipients
+isActive=Enabled
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_it.properties
new file mode 100644
index 0000000..e4f3e2c
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_it.properties
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+sender=Mittente
+template=Modello
+traceLevel=Livello di tracciamento
+notification=Notifica
+about=Soggetti
+events=Eventi
+selfAsRecipient=Includi i soggetti
+checkRecipients=Cerca i destinatari
+isActive=Abilitata
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_pt_BR.properties
new file mode 100644
index 0000000..be1304e
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_pt_BR.properties
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+sender=Remetente
+template=Template
+traceLevel=N\u00edvel de Trace
+notification=Notifica\u00e7\u00e3o
+about=Sobre
+events=Eventos
+selfAsRecipient=Incluir usu\u00e1rios relacionados Sobre
+checkRecipients=Buscar Destinat\u00e1rios
+isActive=Ativada
http://git-wip-us.apache.org/repos/asf/syncope/blob/d80e0233/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_ru.properties
new file mode 100644
index 0000000..15b5c03
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/notifications/NotificationTasks_ru.properties
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
+sender=\u041e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u0435\u043b\u044c
+template=\u0428\u0430\u0431\u043b\u043e\u043d
+traceLevel=\u041b\u043e\u0433\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
+notification=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435
+about=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u043e
+events=\u0421\u043e\u0431\u044b\u0442\u0438\u044f
+selfAsRecipient=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0432 \u043f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439, \u043e \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0440\u0430\u0441\u0441\u044b\u043b\u0430\u0435\u0442\u0441\u044f \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435
+checkRecipients=\u041f\u043e\u0438\u0441\u043a \u043f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0435\u0439
+isActive=\u0410\u043a\u0442\u0438\u0432\u043d\u043e
[2/6] syncope git commit: [SYNCOPE-1004] Now managing selfRead() too
Posted by il...@apache.org.
[SYNCOPE-1004] Now managing selfRead() too
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c3458e4a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c3458e4a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c3458e4a
Branch: refs/heads/2_0_X
Commit: c3458e4a8929329e97fe8eba8c72dcafb61ba948
Parents: 9707b20
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Jan 31 17:25:22 2017 +0100
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Jan 31 17:25:22 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/syncope/core/logic/UserLogic.java | 2 +-
.../provisioning/java/notification/NotificationManagerImpl.java | 5 +++++
.../syncope/core/rest/cxf/service/UserSelfServiceImpl.java | 4 ++--
.../src/test/java/org/apache/syncope/fit/core/ReportITCase.java | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/c3458e4a/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
index b5a41da..f51fdb6 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/UserLogic.java
@@ -115,7 +115,7 @@ public class UserLogic extends AbstractAnyLogic<UserTO, UserPatch> {
@PreAuthorize("isAuthenticated()")
@Transactional(readOnly = true)
- public Pair<String, UserTO> readSelf() {
+ public Pair<String, UserTO> selfRead() {
return ImmutablePair.of(
POJOHelper.serialize(AuthContextUtils.getAuthorizations()),
binder.returnUserTO(binder.getAuthenticatedUserTO()));
http://git-wip-us.apache.org/repos/asf/syncope/blob/c3458e4a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
index 6248185..1a021ae 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.commons.jexl3.MapContext;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.UserTO;
import org.apache.syncope.common.lib.types.AuditElements;
@@ -270,6 +271,10 @@ public class NotificationManagerImpl implements NotificationManager {
any = userDAO.find(((UserTO) before).getKey());
} else if (output instanceof UserTO) {
any = userDAO.find(((UserTO) output).getKey());
+ } else if (output instanceof Pair
+ && ((Pair) output).getRight() instanceof UserTO) {
+
+ any = userDAO.find(((UserTO) ((Pair) output).getRight()).getKey());
} else if (output instanceof ProvisioningResult
&& ((ProvisioningResult) output).getEntity() instanceof UserTO) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/c3458e4a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/UserSelfServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/UserSelfServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/UserSelfServiceImpl.java
index 3ccfd82..c76986e 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/UserSelfServiceImpl.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/UserSelfServiceImpl.java
@@ -56,7 +56,7 @@ public class UserSelfServiceImpl extends AbstractServiceImpl implements UserSelf
@Override
public Response read() {
- Pair<String, UserTO> self = logic.readSelf();
+ Pair<String, UserTO> self = logic.selfRead();
return Response.ok().
header(RESTHeaders.RESOURCE_KEY, self.getValue().getKey()).
header(RESTHeaders.OWNED_ENTITLEMENTS, self.getKey()).
@@ -72,7 +72,7 @@ public class UserSelfServiceImpl extends AbstractServiceImpl implements UserSelf
@Override
public Response update(final UserTO user) {
- Pair<String, UserTO> self = logic.readSelf();
+ Pair<String, UserTO> self = logic.selfRead();
return update(AnyOperations.diff(user, self.getValue(), false));
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/c3458e4a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportITCase.java
index 4dc4663..57ba47e 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReportITCase.java
@@ -257,7 +257,7 @@ public class ReportITCase extends AbstractITCase {
AuditElements.EventCategoryType.LOGIC,
"UserLogic",
null,
- "readSelf",
+ "selfRead",
AuditElements.Result.SUCCESS);
try {