[1/2] syncope git commit: Upgrading Jackson
Repository: syncope Updated Branches: refs/heads/2_0_X f387fbb05 -> bd3745196 refs/heads/master 022d2c5f7 -> 909ed6f56 Upgrading Jackson Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bd374519 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bd374519 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bd374519 Branch: refs/heads/2_0_X Commit: bd3745196b56ab6b027e3edaa98ea1d66bc44fef Parents: f387fbb Author: Francesco ChicchiriccòAuthored: Thu Jan 12 15:17:42 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Jan 12 15:17:42 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/bd374519/pom.xml -- diff --git a/pom.xml b/pom.xml index dc04273..1c4e98a 100644 --- a/pom.xml +++ b/pom.xml @@ -361,7 +361,7 @@ under the License. 2.17.4 -2.8.5 +2.8.6 4.3.5.RELEASE 4.2.1.RELEASE
[2/2] syncope git commit: Upgrading Jackson
Upgrading Jackson Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/909ed6f5 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/909ed6f5 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/909ed6f5 Branch: refs/heads/master Commit: 909ed6f56b0770bcd6d6b258c631c7f3ff573a55 Parents: 022d2c5 Author: Francesco ChicchiriccòAuthored: Thu Jan 12 15:17:42 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Jan 12 15:18:03 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/909ed6f5/pom.xml -- diff --git a/pom.xml b/pom.xml index 41fd3a9..953b132 100644 --- a/pom.xml +++ b/pom.xml @@ -361,7 +361,7 @@ under the License. 2.18.1 -2.8.5 +2.8.6 4.3.5.RELEASE 4.2.1.RELEASE
syncope git commit: [SYNCOPE-773] resize job modals and add compose modal for reports
Repository: syncope Updated Branches: refs/heads/master 3117b89d7 -> 022d2c5f7 [SYNCOPE-773] resize job modals and add compose modal for reports Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/022d2c5f Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/022d2c5f Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/022d2c5f Branch: refs/heads/master Commit: 022d2c5f7470c757efbe8fbb4b875f3edcbc953c Parents: 3117b89 Author: Matteo Di CarloAuthored: Tue Jan 10 10:10:58 2017 +0100 Committer: Matteo Di Carlo Committed: Thu Jan 12 12:08:57 2017 +0100 -- .../reports/ReportletDirectoryPanel.java| 2 +- .../client/console/widgets/JobActionPanel.java | 62 +++- .../client/console/widgets/JobWidget.java | 28 - .../client/console/widgets/JobActionPanel.html | 1 + .../client/console/widgets/JobWidget.html | 1 + .../client/console/widgets/JobWidget.properties | 2 + .../console/widgets/JobWidget_it.properties | 1 + .../console/widgets/JobWidget_pt_BR.properties | 1 + .../console/widgets/JobWidget_ru.properties | 1 + 9 files changed, 95 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/022d2c5f/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 b9ef700..7968fe5 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 @@ -84,7 +84,7 @@ public class ReportletDirectoryPanel extends DirectoryPanel< private final String report; -protected ReportletDirectoryPanel( +public ReportletDirectoryPanel( final BaseModal baseModal, final String report, final PageReference pageRef) { super(BaseModal.CONTENT_ID, pageRef, false); http://git-wip-us.apache.org/repos/asf/syncope/blob/022d2c5f/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java index 30797ae..400e0c7 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java @@ -18,12 +18,14 @@ */ package org.apache.syncope.client.console.widgets; +import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal; import java.io.Serializable; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.client.console.SyncopeConsoleSession; import org.apache.syncope.client.console.commons.Constants; import org.apache.syncope.client.console.pages.BasePage; import org.apache.syncope.client.console.reports.ReportWizardBuilder; +import org.apache.syncope.client.console.reports.ReportletDirectoryPanel; import org.apache.syncope.client.console.rest.ReportRestClient; import org.apache.syncope.client.console.rest.TaskRestClient; import org.apache.syncope.client.console.tasks.SchedTaskWizardBuilder; @@ -36,11 +38,13 @@ import org.apache.syncope.common.lib.to.ReportTO; import org.apache.syncope.common.lib.to.SchedTaskTO; import org.apache.syncope.common.lib.types.JobAction; import org.apache.syncope.common.lib.types.JobType; +import org.apache.syncope.common.lib.types.StandardEntitlement; import org.apache.syncope.common.rest.api.service.NotificationService; import org.apache.syncope.common.rest.api.service.ReportService; import org.apache.syncope.common.rest.api.service.TaskService; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; import org.apache.wicket.event.Broadcast; import org.apache.wicket.event.IEvent; import org.apache.wicket.markup.html.panel.Fragment; @@ -57,17 +61,23 @@ public class JobActionPanel extends WizardMgtPanel { private final BaseModal jobModal; +private final BaseModal reportModal; + public JobActionPanel( final String id, final JobTO jobTO, final JobWidget widget,
syncope git commit: [SYNCOPE-773] resize job modals and add compose modal for reports
Repository: syncope Updated Branches: refs/heads/2_0_X 5c92a9da5 -> f387fbb05 [SYNCOPE-773] resize job modals and add compose modal for reports Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f387fbb0 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f387fbb0 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f387fbb0 Branch: refs/heads/2_0_X Commit: f387fbb057415c0b59ab4b026f3c808c4abaeac3 Parents: 5c92a9d Author: Matteo Di CarloAuthored: Tue Jan 10 10:10:58 2017 +0100 Committer: Matteo Di Carlo Committed: Thu Jan 12 12:06:57 2017 +0100 -- .../reports/ReportletDirectoryPanel.java| 2 +- .../client/console/widgets/JobActionPanel.java | 62 +++- .../client/console/widgets/JobWidget.java | 28 - .../client/console/widgets/JobActionPanel.html | 1 + .../client/console/widgets/JobWidget.html | 1 + .../client/console/widgets/JobWidget.properties | 2 + .../console/widgets/JobWidget_it.properties | 1 + .../console/widgets/JobWidget_pt_BR.properties | 1 + .../console/widgets/JobWidget_ru.properties | 1 + 9 files changed, 95 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/f387fbb0/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 b9ef700..7968fe5 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 @@ -84,7 +84,7 @@ public class ReportletDirectoryPanel extends DirectoryPanel< private final String report; -protected ReportletDirectoryPanel( +public ReportletDirectoryPanel( final BaseModal baseModal, final String report, final PageReference pageRef) { super(BaseModal.CONTENT_ID, pageRef, false); http://git-wip-us.apache.org/repos/asf/syncope/blob/f387fbb0/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java index 30797ae..400e0c7 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java @@ -18,12 +18,14 @@ */ package org.apache.syncope.client.console.widgets; +import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal; import java.io.Serializable; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.client.console.SyncopeConsoleSession; import org.apache.syncope.client.console.commons.Constants; import org.apache.syncope.client.console.pages.BasePage; import org.apache.syncope.client.console.reports.ReportWizardBuilder; +import org.apache.syncope.client.console.reports.ReportletDirectoryPanel; import org.apache.syncope.client.console.rest.ReportRestClient; import org.apache.syncope.client.console.rest.TaskRestClient; import org.apache.syncope.client.console.tasks.SchedTaskWizardBuilder; @@ -36,11 +38,13 @@ import org.apache.syncope.common.lib.to.ReportTO; import org.apache.syncope.common.lib.to.SchedTaskTO; import org.apache.syncope.common.lib.types.JobAction; import org.apache.syncope.common.lib.types.JobType; +import org.apache.syncope.common.lib.types.StandardEntitlement; import org.apache.syncope.common.rest.api.service.NotificationService; import org.apache.syncope.common.rest.api.service.ReportService; import org.apache.syncope.common.rest.api.service.TaskService; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; import org.apache.wicket.event.Broadcast; import org.apache.wicket.event.IEvent; import org.apache.wicket.markup.html.panel.Fragment; @@ -57,17 +61,23 @@ public class JobActionPanel extends WizardMgtPanel { private final BaseModal jobModal; +private final BaseModal reportModal; + public JobActionPanel( final String id, final JobTO jobTO, final JobWidget widget,
[1/2] syncope git commit: Upgrading cargo
Repository: syncope Updated Branches: refs/heads/2_0_X 88e73d273 -> 5c92a9da5 refs/heads/master 8760c -> 3117b89d7 Upgrading cargo Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5c92a9da Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5c92a9da Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5c92a9da Branch: refs/heads/2_0_X Commit: 5c92a9da50e3321479f11a215a25d984da99eb5e Parents: 88e73d2 Author: Francesco ChicchiriccòAuthored: Thu Jan 12 11:48:04 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Jan 12 11:48:04 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/5c92a9da/pom.xml -- diff --git a/pom.xml b/pom.xml index 1b19fe8..dc04273 100644 --- a/pom.xml +++ b/pom.xml @@ -1508,7 +1508,7 @@ under the License. org.codehaus.cargo cargo-maven2-plugin - 1.6.1 + 1.6.2 tomcat8x
[2/2] syncope git commit: Upgrading cargo
Upgrading cargo Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3117b89d Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3117b89d Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3117b89d Branch: refs/heads/master Commit: 3117b89d77cf51337c24fd22bbb24c669d750110 Parents: 876 Author: Francesco ChicchiriccòAuthored: Thu Jan 12 11:48:04 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Jan 12 11:48:13 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/3117b89d/pom.xml -- diff --git a/pom.xml b/pom.xml index aa546b9..41fd3a9 100644 --- a/pom.xml +++ b/pom.xml @@ -1503,7 +1503,7 @@ under the License. org.codehaus.cargo cargo-maven2-plugin - 1.6.1 + 1.6.2 tomcat8x
syncope git commit: Upgrading cargo
Repository: syncope Updated Branches: refs/heads/1_2_X cde182f8d -> df8b0b5e1 Upgrading cargo Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/df8b0b5e Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/df8b0b5e Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/df8b0b5e Branch: refs/heads/1_2_X Commit: df8b0b5e14650658c19c2551805199b9898875e6 Parents: cde182f Author: Francesco ChicchiriccòAuthored: Thu Jan 12 11:47:36 2017 +0100 Committer: Francesco Chicchiriccò Committed: Thu Jan 12 11:47:36 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/df8b0b5e/pom.xml -- diff --git a/pom.xml b/pom.xml index c2b5a50..767cc6b 100644 --- a/pom.xml +++ b/pom.xml @@ -1166,7 +1166,7 @@ under the License. org.codehaus.cargo cargo-maven2-plugin - 1.6.1 + 1.6.2 tomcat7x