Syncope-2_0_X - Build # 34 - Still Failing
The Apache Jenkins build system has built Syncope-2_0_X (build #34) Status: Still Failing Check console output at https://builds.apache.org/job/Syncope-2_0_X/34/ to view the results.
[2/2] syncope git commit: [SYNCOPE-1159] Now PushTasks have source Realm
[SYNCOPE-1159] Now PushTasks have source Realm Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bd6f46e9 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bd6f46e9 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bd6f46e9 Branch: refs/heads/master Commit: bd6f46e9df674fe02721687d8ae810f040e850bc Parents: 3e90e38 Author: Francesco Chicchiriccò Authored: Wed Jul 12 18:06:38 2017 +0200 Committer: Francesco Chicchiriccò Committed: Wed Jul 12 18:06:54 2017 +0200 -- .../tasks/ProvisioningTaskDirectoryPanel.java | 4 +++ .../client/console/tasks/PushTaskFilters.java | 4 --- .../console/tasks/SchedTaskWizardBuilder.java | 22 - .../panels/search/AbstractSearchPanel.html | 21 ++--- .../tasks/SchedTaskDirectoryPanel.properties| 1 + .../tasks/SchedTaskDirectoryPanel_it.properties | 1 + .../SchedTaskDirectoryPanel_pt_BR.properties| 1 + .../tasks/SchedTaskDirectoryPanel_ru.properties | 29 - .../tasks/SchedTaskWizardBuilder$Profile.html | 4 +++ .../syncope/common/lib/to/PushTaskTO.java | 10 ++ .../persistence/api/entity/task/PushTask.java | 5 +++ .../jpa/dao/AbstractAnySearchDAO.java | 12 ++- .../jpa/entity/task/JPAPushTask.java| 17 ++ .../test/resources/domains/MasterContent.xml| 11 +++ .../java/data/TaskDataBinderImpl.java | 3 ++ .../pushpull/AbstractPushResultHandler.java | 8 + .../java/pushpull/PushJobDelegate.java | 33 +--- .../pushpull/RealmPushResultHandlerImpl.java| 8 + .../apache/syncope/fit/core/PushTaskITCase.java | 5 +++ .../reference-guide/concepts/tasks.adoc | 1 + 20 files changed, 149 insertions(+), 51 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/bd6f46e9/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 6634736..0fa0f7b 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 @@ -29,6 +29,7 @@ import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater. import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal; import org.apache.syncope.common.lib.to.AbstractProvisioningTaskTO; import org.apache.syncope.common.lib.to.PullTaskTO; +import org.apache.syncope.common.lib.to.PushTaskTO; import org.apache.syncope.common.lib.types.TaskType; import org.apache.wicket.PageReference; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; @@ -83,6 +84,9 @@ public abstract class ProvisioningTaskDirectoryPanel( new StringResourceModel("destinationRealm", this), "destinationRealm", "destinationRealm")); +} else if (reference == PushTaskTO.class) { +columns.add(new PropertyColumn( +new StringResourceModel("sourceRealm", this), "sourceRealm", "sourceRealm")); } columns.add(new DatePropertyColumn( http://git-wip-us.apache.org/repos/asf/syncope/blob/bd6f46e9/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java index c1e7e14..af40248 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java @@ -54,9 +54,6 @@ public class PushTaskFilters extends WizardStep { } }; -// -// aDynMembershipConds -// add(new ListView("filters", types) { private static final long serialVersionUID = 9101744072914090143L; @@ -80,6 +77,5 @@ public class PushTaskFilters extends WizardStep { .setOutputMarkupId(true)); } }); -// } } http://git-wip-us.apache.org/repos/asf/syncope/blob/bd6f46e9/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizar
[1/2] syncope git commit: [SYNCOPE-1159] Now PushTasks have source Realm
Repository: syncope Updated Branches: refs/heads/2_0_X f191fd002 -> a8c813a2b refs/heads/master 3e90e38fd -> bd6f46e9d [SYNCOPE-1159] Now PushTasks have source Realm Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a8c813a2 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a8c813a2 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a8c813a2 Branch: refs/heads/2_0_X Commit: a8c813a2bf1ef99f1c6aae4e0262bd852ec80daa Parents: f191fd0 Author: Francesco Chicchiriccò Authored: Wed Jul 12 18:06:38 2017 +0200 Committer: Francesco Chicchiriccò Committed: Wed Jul 12 18:06:38 2017 +0200 -- .../tasks/ProvisioningTaskDirectoryPanel.java | 4 +++ .../client/console/tasks/PushTaskFilters.java | 4 --- .../console/tasks/SchedTaskWizardBuilder.java | 22 - .../panels/search/AbstractSearchPanel.html | 21 ++--- .../tasks/SchedTaskDirectoryPanel.properties| 1 + .../tasks/SchedTaskDirectoryPanel_it.properties | 1 + .../SchedTaskDirectoryPanel_pt_BR.properties| 1 + .../tasks/SchedTaskDirectoryPanel_ru.properties | 29 - .../tasks/SchedTaskWizardBuilder$Profile.html | 4 +++ .../syncope/common/lib/to/PushTaskTO.java | 10 ++ .../persistence/api/entity/task/PushTask.java | 5 +++ .../jpa/dao/AbstractAnySearchDAO.java | 12 ++- .../jpa/entity/task/JPAPushTask.java| 17 ++ .../test/resources/domains/MasterContent.xml| 11 +++ .../java/data/TaskDataBinderImpl.java | 3 ++ .../pushpull/AbstractPushResultHandler.java | 8 + .../java/pushpull/PushJobDelegate.java | 33 +--- .../pushpull/RealmPushResultHandlerImpl.java| 8 + .../apache/syncope/fit/core/PushTaskITCase.java | 5 +++ .../reference-guide/concepts/tasks.adoc | 1 + 20 files changed, 149 insertions(+), 51 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/a8c813a2/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 6634736..0fa0f7b 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 @@ -29,6 +29,7 @@ import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater. import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal; import org.apache.syncope.common.lib.to.AbstractProvisioningTaskTO; import org.apache.syncope.common.lib.to.PullTaskTO; +import org.apache.syncope.common.lib.to.PushTaskTO; import org.apache.syncope.common.lib.types.TaskType; import org.apache.wicket.PageReference; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; @@ -83,6 +84,9 @@ public abstract class ProvisioningTaskDirectoryPanel( new StringResourceModel("destinationRealm", this), "destinationRealm", "destinationRealm")); +} else if (reference == PushTaskTO.class) { +columns.add(new PropertyColumn( +new StringResourceModel("sourceRealm", this), "sourceRealm", "sourceRealm")); } columns.add(new DatePropertyColumn( http://git-wip-us.apache.org/repos/asf/syncope/blob/a8c813a2/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java index c1e7e14..af40248 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java @@ -54,9 +54,6 @@ public class PushTaskFilters extends WizardStep { } }; -// -// aDynMembershipConds -// add(new ListView("filters", types) { private static final long serialVersionUID = 9101744072914090143L; @@ -80,6 +77,5 @@ public class PushTaskFilters extends WizardStep { .setOutputMarkupId(true)); } }); -// } } http://git-wip-us.ap
Syncope-2_0_X - Build # 33 - Still Failing
The Apache Jenkins build system has built Syncope-2_0_X (build #33) Status: Still Failing Check console output at https://builds.apache.org/job/Syncope-2_0_X/33/ to view the results.
[1/2] syncope git commit: [SYNCOPE-1158][SYNCOPE-1153] Better PushTask reports
Repository: syncope Updated Branches: refs/heads/2_0_X 26cd1d419 -> f191fd002 refs/heads/master f9c61fbc6 -> 3e90e38fd [SYNCOPE-1158][SYNCOPE-1153] Better PushTask reports Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f191fd00 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f191fd00 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f191fd00 Branch: refs/heads/2_0_X Commit: f191fd00284c345cae1002c5989d780c3d6daa5f Parents: 26cd1d4 Author: Francesco Chicchiriccò Authored: Wed Jul 12 15:42:33 2017 +0200 Committer: Francesco Chicchiriccò Committed: Wed Jul 12 15:42:33 2017 +0200 -- .../syncope/core/logic/UserWorkflowLogic.java | 4 +- .../persistence/jpa/dao/JPAAccessTokenDAO.java | 4 +- .../persistence/jpa/dao/JPAAnyObjectDAO.java| 2 +- .../core/persistence/jpa/dao/JPAGroupDAO.java | 2 +- .../core/persistence/jpa/dao/JPATaskDAO.java| 4 +- .../core/persistence/jpa/dao/JPAUserDAO.java| 2 +- .../propagation/PropagationTaskExecutor.java| 8 - .../java/DefaultUserProvisioningManager.java| 2 +- .../AbstractPropagationTaskExecutor.java| 5 - .../pushpull/AbstractPullResultHandler.java | 6 +- .../pushpull/AbstractPushResultHandler.java | 165 +++ .../pushpull/RealmPullResultHandlerImpl.java| 2 +- .../pushpull/RealmPushResultHandlerImpl.java| 162 +++--- .../pushpull/UserPushResultHandlerImpl.java | 10 +- .../camel/producer/SuspendProducer.java | 2 +- 15 files changed, 216 insertions(+), 164 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/f191fd00/core/logic/src/main/java/org/apache/syncope/core/logic/UserWorkflowLogic.java -- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/UserWorkflowLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/UserWorkflowLogic.java index 41b89ca..433e943 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/UserWorkflowLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/UserWorkflowLogic.java @@ -76,7 +76,7 @@ public class UserWorkflowLogic extends AbstractTransactionalLogic(userPatch, null), updated.getPropByRes(), updated.getPerformedTasks())); -taskExecutor.execute(tasks); +taskExecutor.execute(tasks, false); return binder.getUserTO(updated.getResult()); } @@ -111,7 +111,7 @@ public class UserWorkflowLogic extends AbstractTransactionalLogichttp://git-wip-us.apache.org/repos/asf/syncope/blob/f191fd00/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAccessTokenDAO.java -- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAccessTokenDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAccessTokenDAO.java index 01c53fd..2ecc44e 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAccessTokenDAO.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAccessTokenDAO.java @@ -100,9 +100,7 @@ public class JPAAccessTokenDAO extends AbstractDAO implements Acces TypedQuery query = entityManager().createQuery(queryString.toString(), AccessToken.class); -query.setFirstResult(itemsPerPage * (page <= 0 -? 0 -: page - 1)); +query.setFirstResult(itemsPerPage * (page <= 0 ? 0 : page - 1)); if (itemsPerPage > 0) { query.setMaxResults(itemsPerPage); http://git-wip-us.apache.org/repos/asf/syncope/blob/f191fd00/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java -- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java index b052f30..457944b 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java @@ -204,7 +204,7 @@ public class JPAAnyObjectDAO extends AbstractAnyDAO implements AnyObj @Override public List findAll(final int page, final int itemsPerPage) { TypedQuery query = entityManager().createQuery( -"SELECT e FROM " + JPAAnyObject.class.getSimpleName() + " e", AnyObject.class); +"SE
[2/2] syncope git commit: [SYNCOPE-1158][SYNCOPE-1153] Better PushTask reports
[SYNCOPE-1158][SYNCOPE-1153] Better PushTask reports Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3e90e38f Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3e90e38f Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3e90e38f Branch: refs/heads/master Commit: 3e90e38fd6519ac3b94a6ca3c4db9eab9434f1bd Parents: f9c61fb Author: Francesco Chicchiriccò Authored: Wed Jul 12 15:42:33 2017 +0200 Committer: Francesco Chicchiriccò Committed: Wed Jul 12 15:42:46 2017 +0200 -- .../syncope/core/logic/UserWorkflowLogic.java | 4 +- .../persistence/jpa/dao/JPAAccessTokenDAO.java | 4 +- .../persistence/jpa/dao/JPAAnyObjectDAO.java| 2 +- .../core/persistence/jpa/dao/JPAGroupDAO.java | 2 +- .../core/persistence/jpa/dao/JPATaskDAO.java| 4 +- .../core/persistence/jpa/dao/JPAUserDAO.java| 2 +- .../propagation/PropagationTaskExecutor.java| 8 - .../java/DefaultUserProvisioningManager.java| 2 +- .../AbstractPropagationTaskExecutor.java| 5 - .../pushpull/AbstractPullResultHandler.java | 6 +- .../pushpull/AbstractPushResultHandler.java | 165 +++ .../pushpull/RealmPullResultHandlerImpl.java| 2 +- .../pushpull/RealmPushResultHandlerImpl.java| 162 +++--- .../pushpull/UserPushResultHandlerImpl.java | 10 +- .../camel/producer/SuspendProducer.java | 2 +- 15 files changed, 216 insertions(+), 164 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/3e90e38f/core/logic/src/main/java/org/apache/syncope/core/logic/UserWorkflowLogic.java -- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/UserWorkflowLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/UserWorkflowLogic.java index 41b89ca..433e943 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/UserWorkflowLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/UserWorkflowLogic.java @@ -76,7 +76,7 @@ public class UserWorkflowLogic extends AbstractTransactionalLogic(userPatch, null), updated.getPropByRes(), updated.getPerformedTasks())); -taskExecutor.execute(tasks); +taskExecutor.execute(tasks, false); return binder.getUserTO(updated.getResult()); } @@ -111,7 +111,7 @@ public class UserWorkflowLogic extends AbstractTransactionalLogichttp://git-wip-us.apache.org/repos/asf/syncope/blob/3e90e38f/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAccessTokenDAO.java -- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAccessTokenDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAccessTokenDAO.java index 01c53fd..2ecc44e 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAccessTokenDAO.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAccessTokenDAO.java @@ -100,9 +100,7 @@ public class JPAAccessTokenDAO extends AbstractDAO implements Acces TypedQuery query = entityManager().createQuery(queryString.toString(), AccessToken.class); -query.setFirstResult(itemsPerPage * (page <= 0 -? 0 -: page - 1)); +query.setFirstResult(itemsPerPage * (page <= 0 ? 0 : page - 1)); if (itemsPerPage > 0) { query.setMaxResults(itemsPerPage); http://git-wip-us.apache.org/repos/asf/syncope/blob/3e90e38f/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java -- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java index b052f30..457944b 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAAnyObjectDAO.java @@ -204,7 +204,7 @@ public class JPAAnyObjectDAO extends AbstractAnyDAO implements AnyObj @Override public List findAll(final int page, final int itemsPerPage) { TypedQuery query = entityManager().createQuery( -"SELECT e FROM " + JPAAnyObject.class.getSimpleName() + " e", AnyObject.class); +"SELECT e FROM " + JPAAnyObject.class.getSimpleName() + " e ORDER BY e.id", AnyObject.class); query.setFirstResult(i
Syncope-2_0_X - Build # 32 - Still Failing
The Apache Jenkins build system has built Syncope-2_0_X (build #32) Status: Still Failing Check console output at https://builds.apache.org/job/Syncope-2_0_X/32/ to view the results.
[1/2] syncope git commit: [SYNCOPE-1152] Adaptations for reasonable working with delegated admin
Repository: syncope Updated Branches: refs/heads/2_0_X 6d086d5f3 -> 26cd1d419 refs/heads/master 20596e2e0 -> f9c61fbc6 [SYNCOPE-1152] Adaptations for reasonable working with delegated admin Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/26cd1d41 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/26cd1d41 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/26cd1d41 Branch: refs/heads/2_0_X Commit: 26cd1d4198a158e021c9290f9194b67d368e1eb0 Parents: 6d086d5 Author: Francesco Chicchiriccò Authored: Wed Jul 12 10:19:58 2017 +0200 Committer: Francesco Chicchiriccò Committed: Wed Jul 12 10:19:58 2017 +0200 -- .../console/commons/ResourceStatusDataProvider.java| 10 +- .../client/console/layout/FormLayoutInfoUtils.java | 3 ++- .../apache/syncope/client/console/panels/AnyPanel.java | 5 ++--- .../client/console/panels/GroupDirectoryPanel.java | 2 +- .../apache/syncope/client/console/panels/Realm.java| 13 - .../client/console/panels/RoleDirectoryPanel.java | 2 +- .../syncope/client/console/widgets/NumberWidget.java | 1 + .../syncope/common/lib/types/StandardEntitlement.java | 2 -- .../org/apache/syncope/core/logic/DynRealmLogic.java | 1 - .../src/test/resources/domains/MasterContent.xml | 8 10 files changed, 28 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/26cd1d41/client/console/src/main/java/org/apache/syncope/client/console/commons/ResourceStatusDataProvider.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/ResourceStatusDataProvider.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/ResourceStatusDataProvider.java index d743971..0d936a5 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/commons/ResourceStatusDataProvider.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/ResourceStatusDataProvider.java @@ -93,7 +93,7 @@ public class ResourceStatusDataProvider extends DirectoryDataProvider(this); +this.comparator = new SortableDataProviderComparator<>(this); this.realm = realm; this.type = type; @@ -106,15 +106,15 @@ public class ResourceStatusDataProvider extends DirectoryDataProvider result -= restClient.search(realm, fiql, (page < 0 ? 0 : page) + 1, paginatorRows, getSort(), type); +List result = +restClient.search(realm, fiql, (page < 0 ? 0 : page) + 1, paginatorRows, getSort(), type); List res = CollectionUtils.collect(result, new Transformer() { @Override public StatusBean transform(final AnyTO input) { -final List connObjects -= statusUtils.getConnectorObjects(input, Collections.singletonList(resource)); +final List connObjects = +statusUtils.getConnectorObjects(input, Collections.singletonList(resource)); return statusUtils.getStatusBean( input, http://git-wip-us.apache.org/repos/asf/syncope/blob/26cd1d41/client/console/src/main/java/org/apache/syncope/client/console/layout/FormLayoutInfoUtils.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/layout/FormLayoutInfoUtils.java b/client/console/src/main/java/org/apache/syncope/client/console/layout/FormLayoutInfoUtils.java index 2ac6f41..2a6a191 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/layout/FormLayoutInfoUtils.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/layout/FormLayoutInfoUtils.java @@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import java.io.IOException; import java.lang.reflect.InvocationTargetException; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -45,7 +46,7 @@ public final class FormLayoutInfoUtils { private static final ObjectMapper MAPPER = new ObjectMapper(); public static Triple> fetch( -final List anyTypes) { +final Collection anyTypes) { List ownedRoles = SyncopeConsoleSession.get().getSelfTO().getRoles(); try { http://git-wip-us.apache.org/repos/asf/syncope/blob/26cd1d41/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/consol
[2/2] syncope git commit: [SYNCOPE-1152] Adaptations for reasonable working with delegated admin
[SYNCOPE-1152] Adaptations for reasonable working with delegated admin Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f9c61fbc Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f9c61fbc Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f9c61fbc Branch: refs/heads/master Commit: f9c61fbc6d9a1760bdcc777f3427e49b9349c5b6 Parents: 20596e2 Author: Francesco Chicchiriccò Authored: Wed Jul 12 10:19:58 2017 +0200 Committer: Francesco Chicchiriccò Committed: Wed Jul 12 10:20:13 2017 +0200 -- .../console/commons/ResourceStatusDataProvider.java| 10 +- .../client/console/layout/FormLayoutInfoUtils.java | 3 ++- .../apache/syncope/client/console/panels/AnyPanel.java | 5 ++--- .../client/console/panels/GroupDirectoryPanel.java | 2 +- .../apache/syncope/client/console/panels/Realm.java| 13 - .../client/console/panels/RoleDirectoryPanel.java | 2 +- .../syncope/client/console/widgets/NumberWidget.java | 1 + .../syncope/common/lib/types/StandardEntitlement.java | 2 -- .../org/apache/syncope/core/logic/DynRealmLogic.java | 1 - .../src/test/resources/domains/MasterContent.xml | 8 10 files changed, 28 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/f9c61fbc/client/console/src/main/java/org/apache/syncope/client/console/commons/ResourceStatusDataProvider.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/ResourceStatusDataProvider.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/ResourceStatusDataProvider.java index d743971..0d936a5 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/commons/ResourceStatusDataProvider.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/ResourceStatusDataProvider.java @@ -93,7 +93,7 @@ public class ResourceStatusDataProvider extends DirectoryDataProvider(this); +this.comparator = new SortableDataProviderComparator<>(this); this.realm = realm; this.type = type; @@ -106,15 +106,15 @@ public class ResourceStatusDataProvider extends DirectoryDataProvider result -= restClient.search(realm, fiql, (page < 0 ? 0 : page) + 1, paginatorRows, getSort(), type); +List result = +restClient.search(realm, fiql, (page < 0 ? 0 : page) + 1, paginatorRows, getSort(), type); List res = CollectionUtils.collect(result, new Transformer() { @Override public StatusBean transform(final AnyTO input) { -final List connObjects -= statusUtils.getConnectorObjects(input, Collections.singletonList(resource)); +final List connObjects = +statusUtils.getConnectorObjects(input, Collections.singletonList(resource)); return statusUtils.getStatusBean( input, http://git-wip-us.apache.org/repos/asf/syncope/blob/f9c61fbc/client/console/src/main/java/org/apache/syncope/client/console/layout/FormLayoutInfoUtils.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/layout/FormLayoutInfoUtils.java b/client/console/src/main/java/org/apache/syncope/client/console/layout/FormLayoutInfoUtils.java index 2ac6f41..2a6a191 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/layout/FormLayoutInfoUtils.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/layout/FormLayoutInfoUtils.java @@ -23,6 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import java.io.IOException; import java.lang.reflect.InvocationTargetException; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -45,7 +46,7 @@ public final class FormLayoutInfoUtils { private static final ObjectMapper MAPPER = new ObjectMapper(); public static Triple> fetch( -final List anyTypes) { +final Collection anyTypes) { List ownedRoles = SyncopeConsoleSession.get().getSelfTO().getRoles(); try { http://git-wip-us.apache.org/repos/asf/syncope/blob/f9c61fbc/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java -- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java index 8cffcc1
Syncope-2_0_X - Build # 31 - Still Failing
The Apache Jenkins build system has built Syncope-2_0_X (build #31) Status: Still Failing Check console output at https://builds.apache.org/job/Syncope-2_0_X/31/ to view the results.