syncope git commit: [SYNCOPE-1294] PlainSchemaDetailsPanel doesn't display the assigned validator class
Repository: syncope Updated Branches: refs/heads/2_0_X 66579ad93 -> 38327a0a2 [SYNCOPE-1294] PlainSchemaDetailsPanel doesn't display the assigned validator class Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/38327a0a Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/38327a0a Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/38327a0a Branch: refs/heads/2_0_X Commit: 38327a0a23ab3b9869bf65cbcdbc230aa0a0c00c Parents: 66579ad Author: Marco Di Sabatino Di DiodoroAuthored: Wed Apr 4 17:30:57 2018 +0200 Committer: Marco Di Sabatino Di Diodoro Committed: Wed Apr 4 17:30:57 2018 +0200 -- .../client/console/panels/PlainSchemaDetails.java| 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/38327a0a/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java index 53b2fc1..dc85323 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java @@ -62,6 +62,8 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { private final MultiFieldPanel enumerationKeys; private final AjaxDropDownChoicePanel validatorClass; + +private final AjaxDropDownChoicePanel type; public PlainSchemaDetails( final String id, @@ -69,8 +71,8 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { final PlainSchemaTO schemaTO) { super(id, pageReference, schemaTO); - -final AjaxDropDownChoicePanel type = new AjaxDropDownChoicePanel<>( + +type = new AjaxDropDownChoicePanel<>( "type", getString("type"), new PropertyModel(schemaTO, "type")); type.setChoices(Arrays.asList(AttrSchemaType.values())); @@ -324,7 +326,6 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { mimeType.setModelObject(null); mimeType.setChoices(null); -schema.setValidatorClass(null); } else if (AttrSchemaType.Enum.ordinal() == typeOrdinal) { conversionParams.setVisible(false); conversionPattern.setModelObject(null); @@ -350,7 +351,6 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { mimeType.setModelObject(null); mimeType.setChoices(null); -schema.setValidatorClass(null); } else if (AttrSchemaType.Encrypted.ordinal() == typeOrdinal) { conversionParams.setVisible(false); conversionPattern.setModelObject(null); @@ -374,7 +374,6 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { mimeType.setModelObject(null); mimeType.setChoices(null); -schema.setValidatorClass(null); } else if (AttrSchemaType.Binary.ordinal() == typeOrdinal) { conversionParams.setVisible(false); conversionPattern.setModelObject(null); @@ -424,7 +423,9 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { binaryParams.setVisible(false); mimeType.setModelObject(null); mimeType.setChoices(null); +} +if (type.isEnabled() && AttrSchemaType.Binary.ordinal() != typeOrdinal) { schema.setValidatorClass(null); } }
[1/2] syncope git commit: [SYNCOPE-1287] Console implementation
Repository: syncope Updated Branches: refs/heads/master f171ed2ae -> 4e781f4a7 http://git-wip-us.apache.org/repos/asf/syncope/blob/4e781f4a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java index 58ff78d..d25d0f0 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.client.console.commons.SchemaUtils; @@ -151,16 +152,12 @@ public class PlainAttrs extends AbstractAttrs { @Override protected List getAttrsFromTO() { -final List res = new ArrayList<>(anyTO.getPlainAttrs()); -Collections.sort(res, new AttrComparator()); -return res; +return anyTO.getPlainAttrs().stream().sorted(attrComparator).collect(Collectors.toList()); } @Override protected List getAttrsFromTO(final MembershipTO membershipTO) { -final List res = new ArrayList<>(membershipTO.getPlainAttrs()); -Collections.sort(res, new AttrComparator()); -return res; +return membershipTO.getPlainAttrs().stream().sorted(attrComparator).collect(Collectors.toList()); } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/4e781f4a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java index 4f408e8..4db79bf 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserWizardBuilder.java @@ -54,7 +54,7 @@ public class UserWizardBuilder extends AnyWizardBuilder implements UserF } /** - * Constructor to be used for Approval details only. + * Constructor to be used for Approval and Remediation details only. * * @param previousUserTO previous user status. * @param userTO new user status to be approved. http://git-wip-us.apache.org/repos/asf/syncope/blob/4e781f4a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java index d3d4a82..ebea4b7 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.client.console.wicket.ajax.markup.html.LabelInfo; @@ -108,16 +109,12 @@ public class VirAttrs extends AbstractAttrs { @Override protected List getAttrsFromTO() { -final List res = new ArrayList<>(anyTO.getVirAttrs()); -Collections.sort(res, new AttrComparator()); -return res; +return anyTO.getVirAttrs().stream().sorted(attrComparator).collect(Collectors.toList()); } @Override protected List getAttrsFromTO(final MembershipTO membershipTO) { -final List res = new ArrayList<>(membershipTO.getVirAttrs()); -Collections.sort(res, new AttrComparator()); -return res; +return membershipTO.getVirAttrs().stream().sorted(attrComparator).collect(Collectors.toList()); } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/4e781f4a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java
syncope git commit: [SYNCOPE-1287] Documentation
Repository: syncope Updated Branches: refs/heads/master 4e781f4a7 -> 0bc714db0 [SYNCOPE-1287] Documentation Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0bc714db Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0bc714db Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0bc714db Branch: refs/heads/master Commit: 0bc714db0c8ce5a68708d49ac1796ad6d21c3a25 Parents: 4e781f4 Author: Francesco ChicchiriccòAuthored: Wed Apr 4 17:28:15 2018 +0200 Committer: Francesco Chicchiriccò Committed: Wed Apr 4 17:28:15 2018 +0200 -- .../reference-guide/concepts/provisioning/pull.adoc | 9 + src/main/asciidoc/reference-guide/concepts/tasks.adoc | 1 + 2 files changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/0bc714db/src/main/asciidoc/reference-guide/concepts/provisioning/pull.adoc -- diff --git a/src/main/asciidoc/reference-guide/concepts/provisioning/pull.adoc b/src/main/asciidoc/reference-guide/concepts/provisioning/pull.adoc index 2a7813e..b37f34d 100644 --- a/src/main/asciidoc/reference-guide/concepts/provisioning/pull.adoc +++ b/src/main/asciidoc/reference-guide/concepts/provisioning/pull.adoc @@ -144,3 +144,12 @@ endif::[] | Required for setup of an External Resource based on the https://connid.atlassian.net/wiki/display/BASE/Google+Apps#GoogleApps-Configuration[ConnId GoogleApps connector bundle^]. |=== + += Remediation + +Errors during pull might arise for various reasons: values might not be provided for all mandatory attributes or +fail the configured validation, delete User as consequence of an incremental change's processing might be blocked +because such User is configured as Group owner, and so on. + +When Remediation is enabled for a certain < >, execution errors are reported to administrators, +which are given the chance to examine and possibly fix, or just discard. http://git-wip-us.apache.org/repos/asf/syncope/blob/0bc714db/src/main/asciidoc/reference-guide/concepts/tasks.adoc -- diff --git a/src/main/asciidoc/reference-guide/concepts/tasks.adoc b/src/main/asciidoc/reference-guide/concepts/tasks.adoc index 3cc4f80..097916f 100644 --- a/src/main/asciidoc/reference-guide/concepts/tasks.adoc +++ b/src/main/asciidoc/reference-guide/concepts/tasks.adoc @@ -75,6 +75,7 @@ When defining a pull task, the following information must be provided: * chosen < > * destination < > - where entities selected for creation are going to be placed * whether creation, update or deletion on internal storage are allowed or not +* whether < > is enabled * whether to synchronize the status information from the related identity store * selected < > * optional < >
syncope git commit: [SYNCOPE-1294] PlainSchemaDetailsPanel doesn't display the assigned validator class
Repository: syncope Updated Branches: refs/heads/master 0bc714db0 -> 95ee2ffe8 [SYNCOPE-1294] PlainSchemaDetailsPanel doesn't display the assigned validator class Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/95ee2ffe Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/95ee2ffe Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/95ee2ffe Branch: refs/heads/master Commit: 95ee2ffe810336f3bf785e2d231fa15e71630919 Parents: 0bc714d Author: Marco Di Sabatino Di DiodoroAuthored: Wed Apr 4 17:30:57 2018 +0200 Committer: Marco Di Sabatino Di Diodoro Committed: Wed Apr 4 17:48:02 2018 +0200 -- .../client/console/panels/PlainSchemaDetails.java | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/95ee2ffe/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java index e62f289..3ec3c62 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java @@ -67,6 +67,8 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { private final MultiFieldPanel enumerationKeys; private final AjaxDropDownChoicePanel validator; + +private final AjaxDropDownChoicePanel type; public PlainSchemaDetails( final String id, @@ -74,9 +76,9 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { final PlainSchemaTO schemaTO) { super(id, pageReference, schemaTO); - -final AjaxDropDownChoicePanel type = new AjaxDropDownChoicePanel<>( -"type", getString("type"), new PropertyModel<>(schemaTO, "type")); + +type = new AjaxDropDownChoicePanel<>( +"type", getString("type"), new PropertyModel(schemaTO, "type")); type.setChoices(Arrays.asList(AttrSchemaType.values())); type.setEnabled(schemaTO == null || schemaTO.getKey() == null || schemaTO.getKey().isEmpty()); @@ -329,8 +331,6 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { binaryParams.setVisible(false); mimeType.setModelObject(null); mimeType.setChoices(null); - -schema.setValidator(null); } else if (AttrSchemaType.Enum.ordinal() == typeOrdinal) { conversionParams.setVisible(false); conversionPattern.setModelObject(null); @@ -355,8 +355,6 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { binaryParams.setVisible(false); mimeType.setModelObject(null); mimeType.setChoices(null); - -schema.setValidator(null); } else if (AttrSchemaType.Encrypted.ordinal() == typeOrdinal) { conversionParams.setVisible(false); conversionPattern.setModelObject(null); @@ -379,8 +377,6 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { binaryParams.setVisible(false); mimeType.setModelObject(null); mimeType.setChoices(null); - -schema.setValidator(null); } else if (AttrSchemaType.Binary.ordinal() == typeOrdinal) { conversionParams.setVisible(false); conversionPattern.setModelObject(null); @@ -430,7 +426,9 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { binaryParams.setVisible(false); mimeType.setModelObject(null); mimeType.setChoices(null); +} +if (type.isEnabled() && AttrSchemaType.Binary.ordinal() != typeOrdinal) { schema.setValidator(null); } }
[2/2] syncope git commit: [SYNCOPE-1287] Console implementation
[SYNCOPE-1287] Console implementation Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4e781f4a Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4e781f4a Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4e781f4a Branch: refs/heads/master Commit: 4e781f4a7457248e5e1566a1ca35dbcf5f139287 Parents: f171ed2 Author: Francesco ChicchiriccòAuthored: Wed Apr 4 17:00:53 2018 +0200 Committer: Francesco Chicchiriccò Committed: Wed Apr 4 17:00:53 2018 +0200 -- .../client/console/approvals/Approval.java | 8 +- .../approvals/ApprovalDirectoryPanel.java | 40 +- .../client/console/approvals/ApprovalModal.java | 11 +- .../client/console/commons/Constants.java | 6 +- .../client/console/commons/GroupComparator.java | 37 -- .../syncope/client/console/pages/BasePage.java | 24 +- .../client/console/pages/Remediations.java | 42 ++ .../console/panels/AnyObjectDirectoryPanel.java | 8 +- .../client/console/panels/ConnObjects.java | 6 +- .../console/panels/GroupDirectoryPanel.java | 8 +- .../client/console/panels/RealmChoicePanel.java | 26 +- .../panels/RemediationDirectoryPanel.java | 492 +++ .../console/panels/UserDirectoryPanel.java | 8 +- .../client/console/rest/AnyTypeRestClient.java | 8 +- .../client/console/rest/PolicyRestClient.java | 16 +- .../console/rest/RemediationRestClient.java | 65 +++ .../console/status/ResourceStatusModal.java | 6 +- .../client/console/widgets/ApprovalsWidget.java | 24 +- .../client/console/widgets/JobWidget.java | 5 +- .../console/widgets/RemediationsWidget.java | 167 +++ .../console/wizards/any/AbstractAttrs.java | 4 +- .../wizards/any/AnyObjectWizardBuilder.java | 21 +- .../console/wizards/any/AnyObjectWrapper.java | 42 ++ .../client/console/wizards/any/DerAttrs.java| 13 +- .../console/wizards/any/GroupWizardBuilder.java | 19 + .../console/wizards/any/GroupWrapper.java | 11 + .../client/console/wizards/any/PlainAttrs.java | 9 +- .../console/wizards/any/UserWizardBuilder.java | 2 +- .../client/console/wizards/any/VirAttrs.java| 9 +- .../resources/ResourceProvisionPanel.java | 6 +- .../client/console/approvals/ApprovalModal.html | 9 +- .../approvals/ApprovalModal_it.properties | 17 + .../approvals/ApprovalModal_pt_BR.properties| 17 + .../approvals/ApprovalModal_ru.properties | 17 + .../syncope/client/console/pages/BasePage.html | 4 + .../client/console/pages/Remediations.html | 35 ++ .../console/pages/Remediations.properties | 27 + .../console/pages/Remediations_it.properties| 27 + .../console/pages/Remediations_ja.properties| 27 + .../console/pages/Remediations_pt_BR.properties | 27 + .../console/pages/Remediations_ru.properties| 27 + .../panels/UserDirectoryPanel_it.properties | 2 +- .../panels/UserDirectoryPanel_pt_BR.properties | 2 +- .../markup/html/form/ActionPanel_it.properties | 4 +- .../markup/html/form/ActionPanel_ru.properties | 2 +- .../console/widgets/ApprovalsWidget.properties | 2 +- .../widgets/ApprovalsWidget_it.properties | 2 +- .../widgets/ApprovalsWidget_pt_BR.properties| 2 +- .../widgets/RemediationsWidget$InnerPanel.html | 26 + .../widgets/RemediationsWidget.properties | 18 + .../widgets/RemediationsWidget_it.properties| 18 + .../widgets/RemediationsWidget_ja.properties| 18 + .../widgets/RemediationsWidget_pt_BR.properties | 18 + .../widgets/RemediationsWidget_ru.properties| 19 + .../syncope/common/lib/to/RemediationTO.java| 11 +- .../syncope/core/logic/RemediationLogic.java| 6 +- .../persistence/api/dao/RemediationDAO.java | 3 + .../persistence/api/entity/Remediation.java | 5 +- .../core/persistence/jpa/dao/JPAAnyTypeDAO.java | 10 + .../persistence/jpa/dao/JPARemediationDAO.java | 10 + .../persistence/jpa/entity/JPARemediation.java | 16 +- .../validation/entity/RemediationValidator.java | 8 +- .../persistence/jpa/inner/RemediationTest.java | 7 +- .../java/data/RemediationDataBinderImpl.java| 8 +- .../pushpull/AbstractPullResultHandler.java | 11 +- .../cxf/service/RemediationServiceImpl.java | 11 +- .../apache/syncope/fit/core/PullTaskITCase.java | 2 +- 67 files changed, 1386 insertions(+), 232 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/4e781f4a/client/console/src/main/java/org/apache/syncope/client/console/approvals/Approval.java -- diff --git
syncope git commit: No name for users
Repository: syncope Updated Branches: refs/heads/2_0_X 385b062f8 -> 66579ad93 No name for users Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/66579ad9 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/66579ad9 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/66579ad9 Branch: refs/heads/2_0_X Commit: 66579ad9399470a85363fbb29d3630698c180f82 Parents: 385b062 Author: Francesco ChicchiriccòAuthored: Wed Apr 4 17:28:53 2018 +0200 Committer: Francesco Chicchiriccò Committed: Wed Apr 4 17:28:53 2018 +0200 -- .../syncope/client/console/panels/UserDirectoryPanel_it.properties | 2 +- .../client/console/panels/UserDirectoryPanel_pt_BR.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/66579ad9/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_it.properties -- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_it.properties index 6295415..1b03294 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_it.properties @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. any.edit=Modifica ${anyTO.type} ${anyTO.username} -any.propagation.tasks=Task di propagazione per ${type} ${name} +any.propagation.tasks=Task di propagazione per ${type} ${username} any.notification.tasks=Task di notifica per ${type} ${username} http://git-wip-us.apache.org/repos/asf/syncope/blob/66579ad9/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_pt_BR.properties -- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_pt_BR.properties index 9ef0ad9..9498b19 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_pt_BR.properties @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. any.edit=Alterar ${anyTO.type} ${anyTO.username} -any.propagation.tasks=Propagation tasks for ${type} ${name} +any.propagation.tasks=Propagation tasks for ${type} ${username} any.notification.tasks=Notification tasks for ${type} ${username}
[3/3] syncope git commit: Minor fixes to Approvals
Minor fixes to Approvals Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/888fcc10 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/888fcc10 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/888fcc10 Branch: refs/heads/2_0_X Commit: 888fcc107a9a1c127760c0fdb06806a658e31d53 Parents: 00ede3c Author: Francesco ChicchiriccòAuthored: Wed Apr 4 09:17:44 2018 +0200 Committer: Francesco Chicchiriccò Committed: Wed Apr 4 09:17:44 2018 +0200 -- .../syncope/client/console/approvals/Approval.java | 4 ++-- .../console/approvals/ApprovalDirectoryPanel.java | 12 +--- .../syncope/client/console/approvals/ApprovalModal.java | 9 + .../syncope/client/console/widgets/JobWidget.java | 5 + .../client/console/widgets/ApprovalsWidget.properties | 2 +- .../console/widgets/ApprovalsWidget_it.properties | 2 +- .../console/widgets/ApprovalsWidget_pt_BR.properties| 2 +- 7 files changed, 16 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/888fcc10/client/console/src/main/java/org/apache/syncope/client/console/approvals/Approval.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/approvals/Approval.java b/client/console/src/main/java/org/apache/syncope/client/console/approvals/Approval.java index d56dab8..860ed7a 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/approvals/Approval.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/approvals/Approval.java @@ -190,7 +190,7 @@ public abstract class Approval extends Panel { @Override public void onClick(final AjaxRequestTarget target) { -viewDetails(formTO, target); +viewDetails(target); } }; MetaDataRoleAuthorizationStrategy.authorize(userDetails, ENABLE, StandardEntitlement.USER_READ); @@ -202,5 +202,5 @@ public abstract class Approval extends Panel { add(userDetails); } -protected abstract void viewDetails(final WorkflowFormTO formTO, final AjaxRequestTarget target); +protected abstract void viewDetails(AjaxRequestTarget target); } http://git-wip-us.apache.org/repos/asf/syncope/blob/888fcc10/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java index 5009635..a324ea3 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java @@ -115,7 +115,6 @@ public class ApprovalDirectoryPanel @Override protected List > getColumns() { - List > columns = new ArrayList<>(); columns.add(new PropertyColumn ( new ResourceModel("taskId"), "taskId", "taskId")); @@ -155,11 +154,10 @@ public class ApprovalDirectoryPanel @Override public void onClick(final AjaxRequestTarget target, final WorkflowFormTO ignore) { -final IModel formModel = new CompoundPropertyModel<>(model.getObject()); -manageApprovalModal.setFormModel(formModel); +manageApprovalModal.setFormModel(new CompoundPropertyModel<>(model.getObject())); -target.add(manageApprovalModal.setContent(new ApprovalModal(manageApprovalModal, pageRef, model. -getObject()) { +target.add(manageApprovalModal.setContent( +new ApprovalModal(manageApprovalModal, pageRef, model.getObject()) { private static final long serialVersionUID = 5546519445061007248L; @@ -281,14 +279,14 @@ public class ApprovalDirectoryPanel } @Override -public IModel model(final WorkflowFormTO configuration) { +public IModel model(final WorkflowFormTO form) { return new AbstractReadOnlyModel() { private static final long serialVersionUID = -2566070996511906708L; @Override public WorkflowFormTO getObject() { -return configuration; +return form; } }; }
[1/3] syncope git commit: Adjusting JRebel conf to new style
Repository: syncope Updated Branches: refs/heads/2_0_X 82ffa80d4 -> 888fcc107 Adjusting JRebel conf to new style Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8dc14566 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8dc14566 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8dc14566 Branch: refs/heads/2_0_X Commit: 8dc14566f47a2b49d487ab885809fe3e7627e93e Parents: 82ffa80 Author: Francesco ChicchiriccòAuthored: Tue Apr 3 17:06:52 2018 +0200 Committer: Francesco Chicchiriccò Committed: Wed Apr 4 08:58:02 2018 +0200 -- fit/console-reference/pom.xml | 2 +- fit/core-reference/pom.xml| 2 +- fit/enduser-reference/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/8dc14566/fit/console-reference/pom.xml -- diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml index c3fca77..e4f2405 100644 --- a/fit/console-reference/pom.xml +++ b/fit/console-reference/pom.xml @@ -388,7 +388,7 @@ under the License. -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n --noverify -javaagent:${env.REBEL_HOME}/legacy/jrebel.jar -Drebel.spring_plugin=true +-noverify -agentpath:${env.REBEL_HOME}/lib/libjrebel64.so -Drebel.spring_plugin=true -Dwicket.configuration=development -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m -Xmx1024m -Xms512m http://git-wip-us.apache.org/repos/asf/syncope/blob/8dc14566/fit/core-reference/pom.xml -- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index 7b883ac..d31c5a6 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -1004,7 +1004,7 @@ under the License. -Xdebug -Djaxb.debug=true -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n --noverify -javaagent:${env.REBEL_HOME}/legacy/jrebel.jar -Drebel.spring_plugin=true +-noverify -agentpath:${env.REBEL_HOME}/lib/libjrebel64.so -Drebel.spring_plugin=true -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m -Xmx1024m -Xms512m http://git-wip-us.apache.org/repos/asf/syncope/blob/8dc14566/fit/enduser-reference/pom.xml -- diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml index 305e0a7..61ddfd9 100644 --- a/fit/enduser-reference/pom.xml +++ b/fit/enduser-reference/pom.xml @@ -547,7 +547,7 @@ under the License. -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n --noverify -javaagent:${env.REBEL_HOME}/legacy/jrebel.jar -Drebel.spring_plugin=true +-noverify -agentpath:${env.REBEL_HOME}/lib/libjrebel64.so -Drebel.spring_plugin=true -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m -Xmx1024m -Xms512m
[2/3] syncope git commit: Adjusting JRebel conf to new style
Adjusting JRebel conf to new style Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/de75581b Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/de75581b Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/de75581b Branch: refs/heads/master Commit: de75581b61aacc19b5aba39224160294a9deaae2 Parents: 8ef021e Author: Francesco ChicchiriccòAuthored: Tue Apr 3 17:06:52 2018 +0200 Committer: Francesco Chicchiriccò Committed: Tue Apr 3 17:06:52 2018 +0200 -- fit/console-reference/pom.xml | 2 +- fit/core-reference/pom.xml| 2 +- fit/enduser-reference/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/de75581b/fit/console-reference/pom.xml -- diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml index 253b043..bbd431d 100644 --- a/fit/console-reference/pom.xml +++ b/fit/console-reference/pom.xml @@ -396,7 +396,7 @@ under the License. -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n --noverify -javaagent:${env.REBEL_HOME}/legacy/jrebel.jar -Drebel.spring_plugin=true +-noverify -agentpath:${env.REBEL_HOME}/lib/libjrebel64.so -Drebel.spring_plugin=true -Dwicket.configuration=development -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m -Xmx1024m -Xms512m http://git-wip-us.apache.org/repos/asf/syncope/blob/de75581b/fit/core-reference/pom.xml -- diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index 0a9..3b04b62 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -1028,7 +1028,7 @@ under the License. -Xdebug -Djaxb.debug=true -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n --noverify -javaagent:${env.REBEL_HOME}/legacy/jrebel.jar -Drebel.spring_plugin=true +-noverify -agentpath:${env.REBEL_HOME}/lib/libjrebel64.so -Drebel.spring_plugin=true -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m -Xmx1024m -Xms512m http://git-wip-us.apache.org/repos/asf/syncope/blob/de75581b/fit/enduser-reference/pom.xml -- diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml index c9eb188..c2fe31a 100644 --- a/fit/enduser-reference/pom.xml +++ b/fit/enduser-reference/pom.xml @@ -547,7 +547,7 @@ under the License. -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n --noverify -javaagent:${env.REBEL_HOME}/legacy/jrebel.jar -Drebel.spring_plugin=true +-noverify -agentpath:${env.REBEL_HOME}/lib/libjrebel64.so -Drebel.spring_plugin=true -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m -Xmx1024m -Xms512m
[1/3] syncope git commit: [SYNCOPE-1254] Fighting (and losing) with Java 8 lambda
Repository: syncope Updated Branches: refs/heads/master a8eff1cc2 -> a346bbf6a [SYNCOPE-1254] Fighting (and losing) with Java 8 lambda Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8ef021e2 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8ef021e2 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8ef021e2 Branch: refs/heads/master Commit: 8ef021e23f67027dda842559029fd65788beb865 Parents: a8eff1c Author: Francesco ChicchiriccòAuthored: Tue Apr 3 13:13:07 2018 +0200 Committer: Francesco Chicchiriccò Committed: Tue Apr 3 13:13:07 2018 +0200 -- .../wizards/resources/ConnectorDetailsPanel.java | 15 ++- 1 file changed, 6 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/8ef021e2/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java index 1a5f9a7..d69b7d3 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ConnectorDetailsPanel.java @@ -19,7 +19,6 @@ package org.apache.syncope.client.console.wizards.resources; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; import org.apache.syncope.client.console.SyncopeConsoleSession; @@ -56,14 +55,12 @@ public class ConnectorDetailsPanel extends WizardStep { @Override protected List load() { -List allRealms = new RealmRestClient().list(); -allRealms.removeAll(allRealms.stream().filter(realm --> authRealms.stream().anyMatch(fullpath -> realm.getFullPath().startsWith(fullpath))). -collect(Collectors.toList())); - -List result = allRealms.stream().map(RealmTO::getFullPath).collect(Collectors.toList()); -Collections.sort(result); -return result; +return new RealmRestClient().list().stream(). +filter(realm -> authRealms.stream(). +anyMatch(authRealm -> realm.getFullPath().startsWith(authRealm))). +map(RealmTO::getFullPath). +sorted(). +collect(Collectors.toList()); } };
[2/2] syncope git commit: [SYNCOPE-1292] Implementation provided
[SYNCOPE-1292] Implementation provided Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f171ed2a Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f171ed2a Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f171ed2a Branch: refs/heads/master Commit: f171ed2aeb6de42a5f0f2430d073fe2d9fb0af16 Parents: a346bbf Author: Francesco ChicchiriccòAuthored: Wed Apr 4 10:29:29 2018 +0200 Committer: Francesco Chicchiriccò Committed: Wed Apr 4 11:09:59 2018 +0200 -- .../test/resources/domains/MasterContent.xml| 2 +- .../core/provisioning/api/MappingManager.java | 2 +- .../provisioning/java/MappingManagerImpl.java | 27 +++-- .../AbstractPropagationTaskExecutor.java| 71 ++-- .../pushpull/AbstractPullResultHandler.java | 6 +- .../pushpull/AbstractPushResultHandler.java | 27 +++-- .../pushpull/DefaultRealmPullResultHandler.java | 6 +- .../pushpull/DefaultRealmPushResultHandler.java | 31 +++--- .../pushpull/LDAPMembershipPullActions.java | 2 +- .../java/pushpull/PullJobDelegate.java | 4 +- .../provisioning/java/pushpull/PullUtils.java | 107 +++ 11 files changed, 162 insertions(+), 123 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/f171ed2a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml -- diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml index 855894f..3243cf2 100644 --- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml +++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml @@ -711,7 +711,7 @@ under the License. location="${connid.location}" connectorName="net.tirasa.connid.bundles.ldap.LdapConnector" version="${connid.ldap.version}" - jsonConf='[{"schema":{"name":"synchronizePasswords","displayName":"Enable Password Synchronization","helpMessage":"If true, the connector will synchronize passwords. The Password Capture Plugin needs to be installed for password synchronization to work.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"maintainLdapGroupMembership","displayName":"Maintain LDAP Group Membership","helpMessage":"When enabled and a user is renamed or deleted, update any LDAP groups to which the user belongs to reflect the new name. Otherwise, the LDAP resource must maintain referential integrity with respect to group membership.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["true"]},{"schema":{"name":"host","displayName":"Host","helpMessage":"The name or IP address of the host where the LDAP server is running.","type":"jav a.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["localhost"]},{"schema":{"name":"passwordHashAlgorithm","displayName":"Password Hash Algorithm","helpMessage":"Indicates the algorithm that the Identity system should use to hash the password. Currently supported values are SSHA, SHA, SSHA1, and SHA1. A blank value indicates that the system will not hash passwords. This will cause cleartext passwords to be stored in LDAP unless the LDAP server performs the hash (Netscape Directory Server and iPlanet Directory Server do).","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["SHA"]},{"schema":{"name":"port","displayName":"TCP Port","helpMessage":"TCP/IP port number used to communicate with the LDAP server.","type":"int","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[1389]},{"schema":{"name":"vlvSo rtAttribute","displayName":"VLV Sort Attribute","helpMessage":"Specify the sort attribute to use for VLV indexes on the resource.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"statusManagementClass","displayName":"Status management class ","helpMessage":"Class to be used to manage enabled/disabled status. If no class is specified then identity status management wont be possible.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["net.tirasa.connid.bundles.ldap.commons.AttributeStatusManagement"]},{"schema":{"name":"accountObjectClasses","displayName":"Account Object
[1/2] syncope git commit: [SYNCOPE-1292] Implementation provided
Repository: syncope Updated Branches: refs/heads/2_0_X 888fcc107 -> 385b062f8 refs/heads/master a346bbf6a -> f171ed2ae [SYNCOPE-1292] Implementation provided Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/385b062f Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/385b062f Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/385b062f Branch: refs/heads/2_0_X Commit: 385b062f8da6c49537e3b97faf538758e0b77915 Parents: 888fcc1 Author: Francesco ChicchiriccòAuthored: Wed Apr 4 10:29:29 2018 +0200 Committer: Francesco Chicchiriccò Committed: Wed Apr 4 10:29:29 2018 +0200 -- .../test/resources/domains/MasterContent.xml| 2 +- .../provisioning/java/MappingManagerImpl.java | 24 ++-- .../AbstractPropagationTaskExecutor.java| 71 ++- .../pushpull/AbstractPullResultHandler.java | 6 +- .../pushpull/AbstractPushResultHandler.java | 27 ++-- .../pushpull/DefaultRealmPullResultHandler.java | 6 +- .../pushpull/DefaultRealmPushResultHandler.java | 27 ++-- .../pushpull/LDAPMembershipPullActions.java | 2 +- .../java/pushpull/PullJobDelegate.java | 4 +- .../provisioning/java/pushpull/PullUtils.java | 125 +++ 10 files changed, 165 insertions(+), 129 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/385b062f/core/persistence-jpa/src/test/resources/domains/MasterContent.xml -- diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml index f6c4b90..437596c 100644 --- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml +++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml @@ -692,7 +692,7 @@ under the License. location="${connid.location}" connectorName="net.tirasa.connid.bundles.ldap.LdapConnector" version="${connid.ldap.version}" - jsonConf='[{"schema":{"name":"synchronizePasswords","displayName":"Enable Password Synchronization","helpMessage":"If true, the connector will synchronize passwords. The Password Capture Plugin needs to be installed for password synchronization to work.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"maintainLdapGroupMembership","displayName":"Maintain LDAP Group Membership","helpMessage":"When enabled and a user is renamed or deleted, update any LDAP groups to which the user belongs to reflect the new name. Otherwise, the LDAP resource must maintain referential integrity with respect to group membership.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["true"]},{"schema":{"name":"host","displayName":"Host","helpMessage":"The name or IP address of the host where the LDAP server is running.","type":"jav a.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["localhost"]},{"schema":{"name":"passwordHashAlgorithm","displayName":"Password Hash Algorithm","helpMessage":"Indicates the algorithm that the Identity system should use to hash the password. Currently supported values are SSHA, SHA, SSHA1, and SHA1. A blank value indicates that the system will not hash passwords. This will cause cleartext passwords to be stored in LDAP unless the LDAP server performs the hash (Netscape Directory Server and iPlanet Directory Server do).","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["SHA"]},{"schema":{"name":"port","displayName":"TCP Port","helpMessage":"TCP/IP port number used to communicate with the LDAP server.","type":"int","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[1389]},{"schema":{"name":"vlvSo rtAttribute","displayName":"VLV Sort Attribute","helpMessage":"Specify the sort attribute to use for VLV indexes on the resource.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"statusManagementClass","displayName":"Status management class ","helpMessage":"Class to be used to manage enabled/disabled status. If no class is specified then identity status management wont be