Repository: syncope Updated Branches: refs/heads/2_0_X 5965dfa91 -> a660a26b5 refs/heads/master 33847ad37 -> 4da5dcccb
http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePullJobDelegate.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePullJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePullJobDelegate.java index 542f92d..9155f18 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePullJobDelegate.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePullJobDelegate.java @@ -108,6 +108,7 @@ public class SinglePullJobDelegate extends PullJobDelegate implements SyncopeSin pullTask.setPerformCreate(pullTaskTO.isPerformCreate()); pullTask.setPerformUpdate(pullTaskTO.isPerformUpdate()); pullTask.setPerformDelete(pullTaskTO.isPerformDelete()); + pullTask.setSyncStatus(pullTaskTO.isSyncStatus()); pullTask.setDestinationRealm(realm); // validate JEXL expressions from templates and proceed if fine templateUtils.check(pullTaskTO.getTemplates(), ClientExceptionType.InvalidPullTask); http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePushJobDelegate.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePushJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePushJobDelegate.java index 3f1e655..aae83d4 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePushJobDelegate.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePushJobDelegate.java @@ -73,6 +73,7 @@ public class SinglePushJobDelegate extends PushJobDelegate implements SyncopeSin pushTask.setPerformCreate(pushTaskTO.isPerformCreate()); pushTask.setPerformUpdate(pushTaskTO.isPerformUpdate()); pushTask.setPerformDelete(pushTaskTO.isPerformDelete()); + pushTask.setSyncStatus(pushTaskTO.isSyncStatus()); profile = new ProvisioningProfile<>(connector, pushTask); profile.getActions().addAll(actions); http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReconciliationServiceImpl.java ---------------------------------------------------------------------- diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReconciliationServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReconciliationServiceImpl.java index ad460cb..ed24be5 100644 --- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReconciliationServiceImpl.java +++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReconciliationServiceImpl.java @@ -20,7 +20,7 @@ package org.apache.syncope.core.rest.cxf.service; import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.lib.to.PushTaskTO; -import org.apache.syncope.common.lib.to.ReconciliationStatus; +import org.apache.syncope.common.lib.to.ReconStatus; import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.common.rest.api.service.ReconciliationService; import org.apache.syncope.core.logic.ReconciliationLogic; @@ -38,7 +38,7 @@ public class ReconciliationServiceImpl extends AbstractServiceImpl implements Re private AnyUtilsFactory anyUtilsFactory; @Override - public ReconciliationStatus status(final AnyTypeKind anyTypeKind, final String anyKey, final String resourceKey) { + public ReconStatus status(final AnyTypeKind anyTypeKind, final String anyKey, final String resourceKey) { return logic.status( anyTypeKind, getActualKey(anyUtilsFactory.getInstance(anyTypeKind).dao(), anyKey), http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BulkActionITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BulkActionITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BulkActionITCase.java index a55bf67..abf4a40 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BulkActionITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/BulkActionITCase.java @@ -96,7 +96,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { + "first:container:content:searchContainer:resultTable:tablePanel:groupForm"); assertNotNull(formTester); - formTester.select("checkgroup", 2); + formTester.select("checkgroup", 0); TESTER.executeAjaxEvent(TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:" + "firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:bulkActionLink", @@ -116,7 +116,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { @Test public void userStatusOnSyncopeOnlyBulkAction() { - userStatusBulkAction(0, "Syncope"); + userStatusBulkAction(0, Constants.SYNCOPE); } private void userStatusBulkAction(final int index, final String resource) { @@ -169,7 +169,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { TESTER.cleanupFeedbackMessages(); TESTER.assertLabel(TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:" - + "secondLevelContainer:second:container:selectedObjects:body:rows:1:cells:3:cell", "SUCCESS"); + + "secondLevelContainer:second:container:selectedObjects:body:rows:1:cells:4:cell", "SUCCESS"); TESTER.executeAjaxEvent(TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:secondLevelContainer:back", @@ -224,7 +224,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { TESTER.cleanupFeedbackMessages(); TESTER.assertLabel(TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:" - + "secondLevelContainer:second:container:selectedObjects:body:rows:1:cells:3:cell", "SUCCESS"); + + "secondLevelContainer:second:container:selectedObjects:body:rows:1:cells:4:cell", "SUCCESS"); TESTER.executeAjaxEvent(TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:secondLevelContainer:back", @@ -268,7 +268,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { component = findComponentByProp("resource", TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:" + "firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:groupForm:" - + "checkgroup:dataTable", "ws-target-resource-1"); + + "checkgroup:dataTable", "resource-ldap"); assertNotNull(component); FormTester formTester = TESTER.newFormTester( @@ -276,7 +276,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { + "first:container:content:searchContainer:resultTable:tablePanel:groupForm"); assertNotNull(formTester); - formTester.select("checkgroup", 7); + formTester.select("checkgroup", 0); TESTER.executeAjaxEvent(TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:" + "firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:bulkActionLink", @@ -286,7 +286,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { + "secondLevelContainer:second:container", WebMarkupContainer.class); assertNotNull(findComponentByProp("resource", TAB_PANEL + "outerObjectsRepeater:2:outer:" - + "form:content:status:secondLevelContainer:second:container:selectedObjects", "resource-testdb2")); + + "form:content:status:secondLevelContainer:second:container:selectedObjects", "resource-ldap")); } @Test @@ -316,7 +316,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { component = findComponentByProp("resource", TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:" + "firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:groupForm:" - + "checkgroup:dataTable", "ws-target-resource-1"); + + "checkgroup:dataTable", "resource-db-scripted"); assertNotNull(component); FormTester formTester = TESTER.newFormTester( @@ -324,7 +324,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { + "first:container:content:searchContainer:resultTable:tablePanel:groupForm"); assertNotNull(formTester); - formTester.select("checkgroup", 7); + formTester.select("checkgroup", 0); TESTER.executeAjaxEvent(TAB_PANEL + "outerObjectsRepeater:2:outer:form:content:status:" + "firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:bulkActionLink", @@ -334,7 +334,7 @@ public class BulkActionITCase extends AbstractConsoleITCase { + "secondLevelContainer:second:container", WebMarkupContainer.class); assertNotNull(findComponentByProp("resource", TAB_PANEL + "outerObjectsRepeater:2:outer:" - + "form:content:status:secondLevelContainer:second:container:selectedObjects", "resource-testdb2")); + + "form:content:status:secondLevelContainer:second:container:selectedObjects", "resource-db-scripted")); } @Test http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RealmsITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RealmsITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RealmsITCase.java index cb02357..ff7e251 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RealmsITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/RealmsITCase.java @@ -181,16 +181,17 @@ public class RealmsITCase extends AbstractConsoleITCase { TESTER.clickLink(component.getPageRelativePath() + ":actions:actionRepeater:0:action:action"); TESTER.assertLabel("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:0:value:oldAttribute:field-label", "__NAME__"); + + "secondLevelContainer:second:remoteObject:propView:0:value:leftAttribute:field-label", "__NAME__"); TESTER.assertModelValue("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:0:value:oldAttribute:textField", null); + + "secondLevelContainer:second:remoteObject:propView:0:value:leftAttribute:textField", null); TESTER.assertLabel("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:0:value:newAttribute:field-label", "__NAME__"); + + "secondLevelContainer:second:remoteObject:propView:0:value:rightAttribute:field-label", "__NAME__"); TESTER.assertModelValue("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:0:value:newAttribute:textField", "ou=even,o=isp"); + + "secondLevelContainer:second:remoteObject:propView:0:value:rightAttribute:textField", + "ou=even,o=isp"); TESTER.clickLink("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" + "secondLevelContainer:back"); @@ -226,16 +227,16 @@ public class RealmsITCase extends AbstractConsoleITCase { TESTER.clickLink(component.getPageRelativePath() + ":actions:actionRepeater:0:action:action"); TESTER.assertLabel("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:4:value:oldAttribute:field-label", "ou"); + + "secondLevelContainer:second:remoteObject:propView:4:value:leftAttribute:field-label", "ou"); TESTER.assertModelValue("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:4:value:oldAttribute:textField", "even"); + + "secondLevelContainer:second:remoteObject:propView:4:value:leftAttribute:textField", "even"); TESTER.assertLabel("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:4:value:newAttribute:field-label", "ou"); + + "secondLevelContainer:second:remoteObject:propView:4:value:rightAttribute:field-label", "ou"); TESTER.assertModelValue("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" - + "secondLevelContainer:second:remoteObject:propView:4:value:newAttribute:textField", null); + + "secondLevelContainer:second:remoteObject:propView:4:value:rightAttribute:textField", null); TESTER.clickLink("body:content:body:outerObjectsRepeater:0:outer:form:content:customResultBody:" + "secondLevelContainer:back"); http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java index 48963a2..6dcb678 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/TopologyITCase.java @@ -84,7 +84,7 @@ public class TopologyITCase extends AbstractConsoleITCase { Component component = findComponentByProp("key", "body:resources", "ws-target-resource-1"); assertNotNull(component); TESTER.executeAjaxEvent(component.getPageRelativePath() + ":res", Constants.ON_CLICK); - TESTER.clickLink("body:toggle:container:content:togglePanelContainer:container:actions:status"); + TESTER.clickLink("body:toggle:container:content:togglePanelContainer:container:actions:reconciliation"); TESTER.assertComponent("body:toggle:outerObjectsRepeater:1:outer", Modal.class); http://git-wip-us.apache.org/repos/asf/syncope/blob/a660a26b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReconciliationITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReconciliationITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReconciliationITCase.java index 8fd8680..9ab1578 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReconciliationITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ReconciliationITCase.java @@ -30,7 +30,7 @@ import org.apache.syncope.common.lib.to.AnyObjectTO; import org.apache.syncope.common.lib.to.AttrTO; import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.lib.to.PushTaskTO; -import org.apache.syncope.common.lib.to.ReconciliationStatus; +import org.apache.syncope.common.lib.to.ReconStatus; import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.common.lib.types.UnmatchingRule; import org.apache.syncope.fit.AbstractITCase; @@ -63,7 +63,7 @@ public class ReconciliationITCase extends AbstractITCase { "SELECT id FROM testPRINTER WHERE printername=?", printer.getName()).size()); // 3. verify reconciliation status - ReconciliationStatus status = + ReconStatus status = reconciliationService.status(AnyTypeKind.ANY_OBJECT, printer.getName(), "resource-db-scripted"); assertNotNull(status); assertNotNull(status.getOnSyncope()); @@ -113,7 +113,7 @@ public class ReconciliationITCase extends AbstractITCase { printer.getKey(), printer.getName(), "Nowhere", false, new Date()); // 3. verify reconciliation status - ReconciliationStatus status = + ReconStatus status = reconciliationService.status(AnyTypeKind.ANY_OBJECT, printer.getName(), "resource-db-scripted"); assertNotNull(status); assertNotNull(status.getOnSyncope());
