[SYNCOPE-771] Rename completed
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/61a7fdd3 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/61a7fdd3 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/61a7fdd3 Branch: refs/heads/master Commit: 61a7fdd38e412a30eeb24161400c669a2c3f3228 Parents: 40288e9 Author: Francesco Chicchiriccò <[email protected]> Authored: Fri Mar 11 14:45:35 2016 +0100 Committer: Francesco Chicchiriccò <[email protected]> Committed: Fri Mar 11 14:45:35 2016 +0100 ---------------------------------------------------------------------- .../syncope/client/cli/commands/info/Info.java | 8 +- .../client/cli/commands/info/InfoCommand.java | 4 +- .../cli/commands/info/InfoResultManager.java | 2 +- .../cli/commands/policy/PolicyDetails.java | 6 +- .../commands/policy/PolicyResultManager.java | 12 +- .../resource/ResourceResultManager.java | 4 +- .../client/cli/commands/task/TaskDetails.java | 38 +- .../client/cli/commands/task/TaskList.java | 2 +- .../cli/commands/task/TaskResultManager.java | 58 +- .../cli/src/main/resources/messages.properties | 4 +- .../client/console/commons/Constants.java | 2 +- .../console/panels/ResourceMappingPanel.java | 6 +- .../console/panels/ResourceSecurityPanel.java | 28 +- .../client/console/rest/PolicyRestClient.java | 2 +- .../client/console/rest/TaskRestClient.java | 10 +- .../ProvisioningTaskSearchResultPanel.java | 4 +- .../tasks/PullTaskSearchResultPanel.java | 49 ++ .../syncope/client/console/tasks/PullTasks.java | 53 ++ .../console/tasks/SchedTaskWizardBuilder.java | 36 +- .../tasks/SyncTaskSearchResultPanel.java | 52 -- .../syncope/client/console/tasks/SyncTasks.java | 53 -- .../console/topology/TopologyTogglePanel.java | 12 +- .../markup/html/form/MappingPurposePanel.java | 24 +- .../console/panels/ResourceModal.properties | 2 +- .../console/panels/ResourceModal_it.properties | 2 +- .../panels/ResourceModal_pt_BR.properties | 2 +- .../console/panels/ResourceSecurityPanel.html | 2 +- .../panels/ResourceSecurityPanel.properties | 2 +- .../panels/ResourceSecurityPanel_it.properties | 2 +- .../ResourceSecurityPanel_pt_BR.properties | 2 +- .../tasks/SchedTaskWizardBuilder$Profile.html | 6 +- .../SchedTaskWizardBuilder$Profile.properties | 8 +- ...SchedTaskWizardBuilder$Profile_it.properties | 8 +- ...edTaskWizardBuilder$Profile_pt_BR.properties | 10 +- .../console/topology/TopologyTogglePanel.html | 2 +- .../topology/TopologyTogglePanel.properties | 2 +- .../topology/TopologyTogglePanel_it.properties | 2 +- .../TopologyTogglePanel_pt_BR.properties | 2 +- .../markup/html/form/MappingPurposePanel.html | 2 +- .../console/widgets/CompletenessWidget.html | 2 +- .../widgets/CompletenessWidget.properties | 2 +- .../widgets/CompletenessWidget_it.properties | 2 +- .../widgets/CompletenessWidget_pt_BR.properties | 2 +- .../syncope/common/lib/info/PlatformInfo.java | 24 +- .../common/lib/policy/AbstractPolicyTO.java | 2 +- .../syncope/common/lib/policy/PolicyType.java | 4 +- .../common/lib/policy/PullPolicySpec.java | 64 ++ .../syncope/common/lib/policy/PullPolicyTO.java | 45 + .../common/lib/policy/SyncPolicySpec.java | 64 -- .../syncope/common/lib/policy/SyncPolicyTO.java | 45 - .../lib/to/AbstractProvisioningTaskTO.java | 6 +- .../syncope/common/lib/to/PullTaskTO.java | 78 ++ .../syncope/common/lib/to/ResourceTO.java | 20 +- .../syncope/common/lib/to/SyncTaskTO.java | 78 -- .../syncope/common/lib/types/AuditElements.java | 2 +- .../common/lib/types/AuditLoggerName.java | 4 +- .../common/lib/types/ClientExceptionType.java | 2 +- .../common/lib/types/EntityViolationType.java | 2 +- .../common/lib/types/MappingPurpose.java | 2 +- .../syncope/common/lib/types/PullMode.java | 29 + .../syncope/common/lib/types/SyncMode.java | 29 - .../syncope/common/lib/types/TaskType.java | 2 +- .../apache/syncope/core/logic/LoggerLogic.java | 10 +- .../apache/syncope/core/logic/PolicyLogic.java | 10 +- .../apache/syncope/core/logic/SyncopeLogic.java | 6 +- .../apache/syncope/core/logic/TaskLogic.java | 4 +- .../init/ClassPathScanImplementationLookup.java | 24 +- .../syncope/core/logic/init/JobManagerImpl.java | 12 +- .../persistence/api/ImplementationLookup.java | 2 +- .../api/entity/LinkingMappingItem.java | 2 +- .../api/entity/policy/PullPolicy.java | 30 + .../api/entity/policy/SyncPolicy.java | 30 - .../api/entity/resource/ExternalResource.java | 10 +- .../api/entity/task/AnyTemplatePullTask.java | 28 + .../api/entity/task/AnyTemplateSyncTask.java | 28 - .../api/entity/task/ProvisioningTask.java | 4 +- .../persistence/api/entity/task/PullTask.java | 45 + .../persistence/api/entity/task/SyncTask.java | 45 - .../jpa/dao/JPAExternalResourceDAO.java | 6 +- .../core/persistence/jpa/dao/JPARealmDAO.java | 2 +- .../core/persistence/jpa/dao/JPATaskDAO.java | 8 +- .../jpa/entity/JPAEntityFactory.java | 24 +- .../jpa/entity/policy/JPAPullPolicy.java | 54 ++ .../jpa/entity/policy/JPASyncPolicy.java | 54 -- .../entity/resource/JPAExternalResource.java | 30 +- .../entity/task/AbstractProvisioningTask.java | 14 +- .../jpa/entity/task/JPAAnyTemplatePullTask.java | 61 ++ .../jpa/entity/task/JPAAnyTemplateSyncTask.java | 61 -- .../jpa/entity/task/JPAPullTask.java | 139 +++ .../jpa/entity/task/JPAPushTaskAnyFilter.java | 6 +- .../jpa/entity/task/JPASyncTask.java | 139 --- .../jpa/entity/task/JPATaskUtils.java | 16 +- .../jpa/entity/task/JPATaskUtilsFactory.java | 12 +- .../entity/ProvisioningTaskCheck.java | 2 +- .../entity/ProvisioningTaskValidator.java | 26 +- .../resources/META-INF/spring-orm-oracle.xml | 6 +- .../resources/META-INF/spring-orm-sqlserver.xml | 6 +- .../src/main/resources/META-INF/spring-orm.xml | 6 +- .../core/persistence/jpa/inner/PolicyTest.java | 32 +- .../core/persistence/jpa/inner/TaskTest.java | 2 +- .../persistence/jpa/outer/PlainSchemaTest.java | 4 +- .../persistence/jpa/outer/ResourceTest.java | 2 +- .../core/persistence/jpa/outer/TaskTest.java | 38 +- .../test/resources/domains/MasterContent.xml | 154 ++-- .../core/provisioning/api/Connector.java | 2 +- .../api/UserProvisioningManager.java | 2 +- .../api/data/MappingItemTransformer.java | 6 +- .../pushpull/AnyObjectPullResultHandler.java | 23 + .../pushpull/AnyObjectPushResultHandler.java | 23 + .../api/pushpull/GroupPullResultHandler.java | 26 + .../api/pushpull/GroupPushResultHandler.java | 23 + .../api/pushpull/IgnoreProvisionException.java | 29 + .../api/pushpull/ProvisioningActions.java | 40 + .../api/pushpull/ProvisioningProfile.java | 81 ++ .../api/pushpull/ProvisioningReport.java | 140 +++ .../provisioning/api/pushpull/PullActions.java | 203 +++++ .../api/pushpull/PullCorrelationRule.java | 36 + .../provisioning/api/pushpull/PushActions.java | 163 ++++ .../pushpull/ReconciliationFilterBuilder.java | 30 + .../api/pushpull/SyncopePullResultHandler.java | 29 + .../api/pushpull/SyncopePushResultHandler.java | 26 + .../api/pushpull/SyncopeResultHandler.java | 29 + .../api/pushpull/UserPullResultHandler.java | 23 + .../api/pushpull/UserPushResultHandler.java | 23 + .../syncpull/AnyObjectPushResultHandler.java | 23 - .../syncpull/AnyObjectSyncResultHandler.java | 23 - .../api/syncpull/GroupPushResultHandler.java | 23 - .../api/syncpull/GroupSyncResultHandler.java | 26 - .../api/syncpull/IgnoreProvisionException.java | 29 - .../api/syncpull/ProvisioningActions.java | 40 - .../api/syncpull/ProvisioningProfile.java | 81 -- .../api/syncpull/ProvisioningReport.java | 140 --- .../provisioning/api/syncpull/PushActions.java | 163 ---- .../syncpull/ReconciliationFilterBuilder.java | 30 - .../provisioning/api/syncpull/SyncActions.java | 203 ----- .../api/syncpull/SyncCorrelationRule.java | 36 - .../api/syncpull/SyncopePushResultHandler.java | 26 - .../api/syncpull/SyncopeResultHandler.java | 29 - .../api/syncpull/SyncopeSyncResultHandler.java | 29 - .../api/syncpull/UserPushResultHandler.java | 23 - .../api/syncpull/UserSyncResultHandler.java | 23 - .../provisioning/java/ConnectorFacadeProxy.java | 2 +- .../java/DefaultUserProvisioningManager.java | 6 +- .../provisioning/java/MappingManagerImpl.java | 10 +- .../data/DefaultMappingItemTransformer.java | 2 +- .../java/data/PolicyDataBinderImpl.java | 20 +- .../java/data/RealmDataBinderImpl.java | 2 +- .../java/data/ResourceDataBinderImpl.java | 14 +- .../java/data/TaskDataBinderImpl.java | 74 +- .../LDAPMembershipPropagationActions.java | 2 +- .../AbstractProvisioningJobDelegate.java | 434 ++++++++++ .../pushpull/AbstractPullResultHandler.java | 797 +++++++++++++++++ .../pushpull/AbstractPushResultHandler.java | 434 ++++++++++ .../pushpull/AbstractSyncopeResultHandler.java | 155 ++++ .../AnyObjectPullResultHandlerImpl.java | 112 +++ .../AnyObjectPushResultHandlerImpl.java | 70 ++ .../java/pushpull/DBPasswordPullActions.java | 142 +++ .../java/pushpull/DefaultPullActions.java | 121 +++ .../java/pushpull/DefaultPushActions.java | 100 +++ .../DefaultReconciliationFilterBuilder.java | 38 + .../pushpull/GroupPullResultHandlerImpl.java | 138 +++ .../pushpull/GroupPushResultHandlerImpl.java | 70 ++ .../pushpull/LDAPMembershipPullActions.java | 333 ++++++++ .../java/pushpull/LDAPPasswordPullActions.java | 124 +++ .../pushpull/PlainAttrsPullCorrelationRule.java | 115 +++ .../java/pushpull/PullJobDelegate.java | 248 ++++++ .../provisioning/java/pushpull/PullUtils.java | 317 +++++++ .../java/pushpull/PushJobDelegate.java | 206 +++++ .../pushpull/UserPullResultHandlerImpl.java | 133 +++ .../pushpull/UserPushResultHandlerImpl.java | 96 +++ .../AbstractProvisioningJobDelegate.java | 434 ---------- .../syncpull/AbstractPushResultHandler.java | 434 ---------- .../syncpull/AbstractSyncResultHandler.java | 797 ----------------- .../syncpull/AbstractSyncopeResultHandler.java | 155 ---- .../AnyObjectPushResultHandlerImpl.java | 70 -- .../AnyObjectSyncResultHandlerImpl.java | 112 --- .../java/syncpull/DBPasswordSyncActions.java | 142 --- .../java/syncpull/DefaultPushActions.java | 100 --- .../DefaultReconciliationFilterBuilder.java | 38 - .../java/syncpull/DefaultSyncActions.java | 121 --- .../syncpull/GroupPushResultHandlerImpl.java | 70 -- .../syncpull/GroupSyncResultHandlerImpl.java | 138 --- .../syncpull/LDAPMembershipSyncActions.java | 335 -------- .../java/syncpull/LDAPPasswordSyncActions.java | 124 --- .../syncpull/PlainAttrsSyncCorrelationRule.java | 115 --- .../java/syncpull/PushJobDelegate.java | 206 ----- .../java/syncpull/SyncJobDelegate.java | 248 ------ .../provisioning/java/syncpull/SyncUtils.java | 317 ------- .../syncpull/UserPushResultHandlerImpl.java | 96 --- .../syncpull/UserSyncResultHandlerImpl.java | 133 --- .../java/utils/ConnObjectUtils.java | 22 +- .../rest/cxf/service/PolicyServiceImpl.java | 6 +- .../core/rest/cxf/service/TaskServiceImpl.java | 4 +- .../camel/CamelGroupProvisioningManager.java | 4 +- .../camel/CamelUserProvisioningManager.java | 12 +- .../processor/GroupCreateInPullProcessor.java | 76 ++ .../processor/GroupCreateInSyncProcessor.java | 76 -- .../processor/UserSetStatusInPullProcessor.java | 70 ++ .../processor/UserSetStatusInSyncProcessor.java | 70 -- .../processor/UserUpdateInPullProcessor.java | 62 ++ .../processor/UserUpdateInSyncProcessor.java | 66 -- .../src/main/resources/groupRoutes.xml | 10 +- .../src/main/resources/userRoutes.xml | 18 +- fit/build-tools/src/main/resources/content.ldif | 14 +- fit/build-tools/src/main/resources/testdb.sql | 6 +- .../reference/PrefixMappingItemTransformer.java | 4 +- .../fit/core/reference/TestPullActions.java | 101 +++ .../fit/core/reference/TestPullRule.java | 40 + .../TestReconciliationFilterBuilder.java | 2 +- .../fit/core/reference/TestSyncActions.java | 101 --- .../fit/core/reference/TestSyncRule.java | 40 - .../org/apache/syncope/fit/AbstractITCase.java | 4 +- .../org/apache/syncope/fit/cli/CLIITCase.java | 4 + .../syncope/fit/console/BulkActionITCase.java | 2 +- .../apache/syncope/fit/console/LogsITCase.java | 2 + .../syncope/fit/console/ParametersITCase.java | 2 + .../apache/syncope/fit/console/RolesITCase.java | 2 + .../fit/console/SecurityQuestionsITCase.java | 3 + .../syncope/fit/console/TopologyITCase.java | 6 +- .../syncope/fit/core/AbstractTaskITCase.java | 2 +- .../apache/syncope/fit/core/LoggerITCase.java | 4 +- .../syncope/fit/core/MultitenancyITCase.java | 20 +- .../apache/syncope/fit/core/PolicyITCase.java | 40 +- .../apache/syncope/fit/core/PullTaskITCase.java | 853 ++++++++++++++++++ .../syncope/fit/core/ReportTemplateITCase.java | 6 - .../apache/syncope/fit/core/ResourceITCase.java | 4 +- .../syncope/fit/core/SchedTaskITCase.java | 4 +- .../apache/syncope/fit/core/SearchITCase.java | 24 +- .../apache/syncope/fit/core/SyncTaskITCase.java | 854 ------------------- .../apache/syncope/fit/core/VirAttrITCase.java | 14 +- src/main/asciidoc/concepts/concepts.adoc | 4 +- .../concepts/provisioning/provisioning.adoc | 6 +- .../asciidoc/concepts/provisioning/pull.adoc | 52 ++ .../concepts/provisioning/resources.adoc | 4 +- .../asciidoc/concepts/provisioning/sync.adoc | 52 -- .../workingwithapachesyncope/cli/task.adoc | 2 +- 236 files changed, 7707 insertions(+), 7700 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/Info.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/Info.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/Info.java index bae4b88..81d5014 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/Info.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/Info.java @@ -183,18 +183,18 @@ public class Info { } } - public void syncActions() { + public void pullActions() { try { - infoResultManager.printSyncActions(platformInfo.getSyncActions()); + infoResultManager.printPullActions(platformInfo.getPullActions()); } catch (final Exception ex) { LOG.error("Information error", ex); infoResultManager.genericError(ex.getMessage()); } } - public void syncCorrelationRules() { + public void pullCorrelationRules() { try { - infoResultManager.printCorrelationRules(platformInfo.getSyncCorrelationRules()); + infoResultManager.printCorrelationRules(platformInfo.getPullCorrelationRules()); } catch (final Exception ex) { LOG.error("Information error", ex); infoResultManager.genericError(ex.getMessage()); http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoCommand.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoCommand.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoCommand.java index 1991fdd..60ed46a 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoCommand.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoCommand.java @@ -86,10 +86,10 @@ public class InfoCommand extends AbstractCommand { info.reportlets(); break; case SYNC_ACTIONS: - info.syncActions(); + info.pullActions(); break; case SYNC_CORRELATION_RULES: - info.syncCorrelationRules(); + info.pullCorrelationRules(); break; case TASK_JOBS: info.taskJobs(); http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoResultManager.java index 4494d86..964469e 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/info/InfoResultManager.java @@ -111,7 +111,7 @@ public class InfoResultManager extends CommonsResultManager { } } - public void printSyncActions(final Collection<String> actions) { + public void printPullActions(final Collection<String> actions) { for (final String action : actions) { genericMessage("Sync action: " + action); } http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyDetails.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyDetails.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyDetails.java index 077ab45..faa8270 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyDetails.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyDetails.java @@ -43,15 +43,15 @@ public class PolicyDetails extends AbstractPolicyCommand { final Map<String, String> details = new LinkedMap<>(); final int accountPolicySize = policySyncopeOperations.list(PolicyType.ACCOUNT.name()).size(); final int passwordPolicySize = policySyncopeOperations.list(PolicyType.PASSWORD.name()).size(); - final int syncPolicySize = policySyncopeOperations.list(PolicyType.SYNC.name()).size(); + final int pullPolicySize = policySyncopeOperations.list(PolicyType.PULL.name()).size(); final int pushPolicySize = policySyncopeOperations.list(PolicyType.PUSH.name()).size(); details.put("total number", String.valueOf(accountPolicySize + passwordPolicySize - + syncPolicySize + + pullPolicySize + pushPolicySize)); details.put("account policies", String.valueOf(accountPolicySize)); details.put("password policies", String.valueOf(passwordPolicySize)); - details.put("sync policies", String.valueOf(syncPolicySize)); + details.put("pull policies", String.valueOf(pullPolicySize)); details.put("push policies", String.valueOf(pushPolicySize)); policyResultManager.printDetails(details); } catch (final Exception ex) { http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java index acd7eb3..d0432f3 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/policy/PolicyResultManager.java @@ -24,7 +24,7 @@ import org.apache.syncope.client.cli.commands.CommonsResultManager; import org.apache.syncope.common.lib.policy.AbstractPolicyTO; import org.apache.syncope.common.lib.policy.AccountPolicyTO; import org.apache.syncope.common.lib.policy.PasswordPolicyTO; -import org.apache.syncope.common.lib.policy.SyncPolicyTO; +import org.apache.syncope.common.lib.policy.PullPolicyTO; import org.apache.syncope.common.lib.types.PolicyType; public class PolicyResultManager extends CommonsResultManager { @@ -44,8 +44,8 @@ public class PolicyResultManager extends CommonsResultManager { case PUSH: System.out.println(policyTO); break; - case SYNC: - printSyncPolicy((SyncPolicyTO) policyTO); + case PULL: + printPullPolicy((PullPolicyTO) policyTO); break; default: break; @@ -74,9 +74,9 @@ public class PolicyResultManager extends CommonsResultManager { System.out.println(policyTO); } break; - case SYNC: + case PULL: for (final AbstractPolicyTO policyTO : policyTOs) { - printSyncPolicy((SyncPolicyTO) policyTO); + printPullPolicy((PullPolicyTO) policyTO); } break; default: @@ -110,7 +110,7 @@ public class PolicyResultManager extends CommonsResultManager { System.out.println(""); } - public void printSyncPolicy(final SyncPolicyTO policyTO) { + public void printPullPolicy(final PullPolicyTO policyTO) { System.out.println(" > KEY: " + policyTO.getKey()); System.out.println(" type: " + policyTO.getType().name()); System.out.println(" description: " + policyTO.getDescription()); http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java index 9893a95..18ab0aa 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/resource/ResourceResultManager.java @@ -42,7 +42,7 @@ public class ResourceResultManager extends CommonsResultManager { System.out.println(" connector id: " + resourceTO.getConnector()); System.out.println(" account policy id: " + resourceTO.getAccountPolicy()); System.out.println(" password policy id: " + resourceTO.getPasswordPolicy()); - System.out.println(" sync policy id: " + resourceTO.getSyncPolicy()); + System.out.println(" pull policy id: " + resourceTO.getPullPolicy()); System.out.println(" creator: " + resourceTO.getCreator()); System.out.println(" creation date: " + resourceTO.getCreationDate()); System.out.println(" last modifier: " + resourceTO.getLastModifier()); @@ -54,7 +54,7 @@ public class ResourceResultManager extends CommonsResultManager { System.out.println(" create trace level: " + resourceTO.getCreateTraceLevel()); System.out.println(" delete trace level: " + resourceTO.getDeleteTraceLevel()); System.out.println(" update trace level: " + resourceTO.getUpdateTraceLevel()); - System.out.println(" sync trace level: " + resourceTO.getSyncTraceLevel()); + System.out.println(" pull trace level: " + resourceTO.getPullTraceLevel()); System.out.println(" enforce mandatory condition: " + resourceTO.isEnforceMandatoryCondition()); System.out.println(" override capabilities: " + resourceTO.isOverrideCapabilities()); System.out.println(" random password if not provided: " + resourceTO.isRandomPwdIfNotProvided()); http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDetails.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDetails.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDetails.java index 45fd01c..bb00255 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDetails.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskDetails.java @@ -30,8 +30,8 @@ import org.apache.syncope.common.lib.to.NotificationTaskTO; import org.apache.syncope.common.lib.to.PropagationTaskTO; import org.apache.syncope.common.lib.to.PushTaskTO; import org.apache.syncope.common.lib.to.SchedTaskTO; -import org.apache.syncope.common.lib.to.SyncTaskTO; -import org.apache.syncope.common.lib.types.SyncMode; +import org.apache.syncope.common.lib.to.PullTaskTO; +import org.apache.syncope.common.lib.types.PullMode; import org.apache.syncope.common.lib.types.TaskType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,27 +57,24 @@ public class TaskDetails extends AbstractTaskCommand { final List<AbstractTaskTO> propagationTaskTOs = taskSyncopeOperations.list(TaskType.PROPAGATION.name()); final List<AbstractTaskTO> pushTaskTOs = taskSyncopeOperations.list(TaskType.PUSH.name()); final List<AbstractTaskTO> scheduledTaskTOs = taskSyncopeOperations.list(TaskType.SCHEDULED.name()); - final List<AbstractTaskTO> syncTaskTOs = taskSyncopeOperations.list(TaskType.SYNCHRONIZATION.name()); + final List<AbstractTaskTO> pullTaskTOs = taskSyncopeOperations.list(TaskType.PULL.name()); final List<JobTO> jobTOs = taskSyncopeOperations.listJobs(); final int notificationTaskSize = notificationTaskTOs.size(); - int notificationNotExecuted = 0; final int propagationTaskSize = propagationTaskTOs.size(); - int propagationNotExecuted = 0; final int pushTaskSize = pushTaskTOs.size(); - int pushNotExecuted = 0; final int scheduledTaskSize = scheduledTaskTOs.size(); int scheduledNotExecuted = 0; - final int syncTaskSize = syncTaskTOs.size(); - int syncNotExecuted = 0; - int syncFull = 0; + final int pullTaskSize = pullTaskTOs.size(); final int jobsSize = jobTOs.size(); + int notificationNotExecuted = 0; for (final AbstractTaskTO notificationTaskTO : notificationTaskTOs) { if (!((NotificationTaskTO) notificationTaskTO).isExecuted()) { notificationNotExecuted++; } } + int propagationNotExecuted = 0; for (final AbstractTaskTO propagationTaskTO : propagationTaskTOs) { if (((PropagationTaskTO) propagationTaskTO).getExecutions() == null || ((PropagationTaskTO) propagationTaskTO).getExecutions().isEmpty()) { @@ -85,6 +82,7 @@ public class TaskDetails extends AbstractTaskCommand { } } + int pushNotExecuted = 0; for (final AbstractTaskTO pushTaskTO : pushTaskTOs) { if (((PushTaskTO) pushTaskTO).getExecutions() == null || ((PushTaskTO) pushTaskTO).getExecutions().isEmpty()) { @@ -99,13 +97,15 @@ public class TaskDetails extends AbstractTaskCommand { } } - for (final AbstractTaskTO syncTaskTO : syncTaskTOs) { - if (((SyncTaskTO) syncTaskTO).getExecutions() == null - || ((SyncTaskTO) syncTaskTO).getExecutions().isEmpty()) { - syncNotExecuted++; + int pullNotExecuted = 0; + int pullFull = 0; + for (final AbstractTaskTO pullTaskTO : pullTaskTOs) { + if (((PullTaskTO) pullTaskTO).getExecutions() == null + || ((PullTaskTO) pullTaskTO).getExecutions().isEmpty()) { + pullNotExecuted++; } - if (((SyncTaskTO) syncTaskTO).getSyncMode() == SyncMode.FULL_RECONCILIATION) { - syncFull++; + if (((PullTaskTO) pullTaskTO).getPullMode() == PullMode.FULL_RECONCILIATION) { + pullFull++; } } @@ -113,7 +113,7 @@ public class TaskDetails extends AbstractTaskCommand { + propagationTaskSize + pushTaskSize + scheduledTaskSize - + syncTaskSize)); + + pullTaskSize)); details.put("notification tasks", String.valueOf(notificationTaskSize)); details.put("notification tasks not executed", String.valueOf(notificationNotExecuted)); details.put("propagation tasks", String.valueOf(propagationTaskSize)); @@ -122,9 +122,9 @@ public class TaskDetails extends AbstractTaskCommand { details.put("push tasks not executed", String.valueOf(pushNotExecuted)); details.put("scheduled tasks", String.valueOf(scheduledTaskSize)); details.put("scheduled tasks not executed", String.valueOf(scheduledNotExecuted)); - details.put("synchronization tasks", String.valueOf(syncTaskSize)); - details.put("synchronization tasks not executed", String.valueOf(syncNotExecuted)); - details.put("synchronization tasks with full reconciliation", String.valueOf(syncFull)); + details.put("pull tasks", String.valueOf(pullTaskSize)); + details.put("pull tasks not executed", String.valueOf(pullNotExecuted)); + details.put("pull tasks with full reconciliation", String.valueOf(pullFull)); details.put("jobs", String.valueOf(jobsSize)); taskResultManager.printDetails(details); } catch (final SyncopeClientException ex) { http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java index 02a22b0..90b9cf8 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskList.java @@ -32,7 +32,7 @@ public class TaskList extends AbstractTaskCommand { private static final Logger LOG = LoggerFactory.getLogger(TaskList.class); private static final String LIST_HELP_MESSAGE = "task --list {TASK-TYPE}\n" - + " Task type: NOTIFICATION / PROPAGATION / PUSH / SCHEDULED / SYNCHRONIZATION"; + + " Task type: NOTIFICATION / PROPAGATION / PUSH / SCHEDULED / PULL"; private final Input input; http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java ---------------------------------------------------------------------- diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java index ed5b977..df7d081 100644 --- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java +++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskResultManager.java @@ -29,7 +29,7 @@ import org.apache.syncope.common.lib.to.NotificationTaskTO; import org.apache.syncope.common.lib.to.PropagationTaskTO; import org.apache.syncope.common.lib.to.PushTaskTO; import org.apache.syncope.common.lib.to.SchedTaskTO; -import org.apache.syncope.common.lib.to.SyncTaskTO; +import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.lib.to.ExecTO; import org.apache.syncope.common.lib.types.TaskType; @@ -46,8 +46,8 @@ public class TaskResultManager extends CommonsResultManager { printPushTask((PushTaskTO) taskTO); } else if (taskTO instanceof SchedTaskTO) { printScheduledTask((SchedTaskTO) taskTO); - } else if (taskTO instanceof SyncTaskTO) { - printSyncTask((SyncTaskTO) taskTO); + } else if (taskTO instanceof PullTaskTO) { + printPullTask((PullTaskTO) taskTO); } } } @@ -75,9 +75,9 @@ public class TaskResultManager extends CommonsResultManager { printScheduledTask((SchedTaskTO) taskTO); } break; - case SYNCHRONIZATION: + case PULL: for (final AbstractTaskTO taskTO : taskTOs) { - printSyncTask((SyncTaskTO) taskTO); + printPullTask((PullTaskTO) taskTO); } break; default: @@ -127,7 +127,7 @@ public class TaskResultManager extends CommonsResultManager { System.out.println(" is perform create: " + pushTaskTO.isPerformCreate()); System.out.println(" is perform delete: " + pushTaskTO.isPerformDelete()); System.out.println(" is perform update: " + pushTaskTO.isPerformUpdate()); - System.out.println(" is sync status: " + pushTaskTO.isSyncStatus()); + System.out.println(" is pull status: " + pushTaskTO.isPullStatus()); System.out.println(" start date: " + pushTaskTO.getStart()); System.out.println(" end date: " + pushTaskTO.getEnd()); System.out.println(" last execution: " + pushTaskTO.getLastExec()); @@ -157,30 +157,30 @@ public class TaskResultManager extends CommonsResultManager { System.out.println(""); } - private void printSyncTask(final SyncTaskTO syncTaskTO) { - System.out.println(" - Sync task key: " + syncTaskTO.getKey()); - System.out.println(" name: " + syncTaskTO.getName()); - System.out.println(" resource: " + syncTaskTO.getResource()); - System.out.println(" realm destination: " + syncTaskTO.getDestinationRealm()); - System.out.println(" cron expression: " + syncTaskTO.getCronExpression()); - System.out.println(" description: " + syncTaskTO.getDescription()); - System.out.println(" sync mode: " + syncTaskTO.getSyncMode()); - System.out.println(" perform create: " + syncTaskTO.isPerformCreate()); - System.out.println(" perform delete: " + syncTaskTO.isPerformDelete()); - System.out.println(" perform update: " + syncTaskTO.isPerformUpdate()); - System.out.println(" sync status: " + syncTaskTO.isSyncStatus()); + private void printPullTask(final PullTaskTO pullTaskTO) { + System.out.println(" - Pull task key: " + pullTaskTO.getKey()); + System.out.println(" name: " + pullTaskTO.getName()); + System.out.println(" resource: " + pullTaskTO.getResource()); + System.out.println(" realm destination: " + pullTaskTO.getDestinationRealm()); + System.out.println(" cron expression: " + pullTaskTO.getCronExpression()); + System.out.println(" description: " + pullTaskTO.getDescription()); + System.out.println(" pull mode: " + pullTaskTO.getPullMode()); + System.out.println(" perform create: " + pullTaskTO.isPerformCreate()); + System.out.println(" perform delete: " + pullTaskTO.isPerformDelete()); + System.out.println(" perform update: " + pullTaskTO.isPerformUpdate()); + System.out.println(" pull status: " + pullTaskTO.isPullStatus()); System.out.println(" TEMPLATES:"); - printTemplates(syncTaskTO.getTemplates()); - System.out.println(" start date: " + syncTaskTO.getStart()); - System.out.println(" end date: " + syncTaskTO.getEnd()); - System.out.println(" next execution: " + syncTaskTO.getNextExec()); - System.out.println(" last execution: " + syncTaskTO.getLastExec()); - System.out.println(" latest execution status: " + syncTaskTO.getLatestExecStatus()); - System.out.println(" job delegate class: " + syncTaskTO.getJobDelegateClassName()); - System.out.println(" action class name: " + syncTaskTO.getActionsClassNames()); - System.out.println(" matching rule: " + syncTaskTO.getMatchingRule()); - System.out.println(" unmatching rule: " + syncTaskTO.getUnmatchingRule()); - printTaskExecTOs(syncTaskTO.getExecutions()); + printTemplates(pullTaskTO.getTemplates()); + System.out.println(" start date: " + pullTaskTO.getStart()); + System.out.println(" end date: " + pullTaskTO.getEnd()); + System.out.println(" next execution: " + pullTaskTO.getNextExec()); + System.out.println(" last execution: " + pullTaskTO.getLastExec()); + System.out.println(" latest execution status: " + pullTaskTO.getLatestExecStatus()); + System.out.println(" job delegate class: " + pullTaskTO.getJobDelegateClassName()); + System.out.println(" action class name: " + pullTaskTO.getActionsClassNames()); + System.out.println(" matching rule: " + pullTaskTO.getMatchingRule()); + System.out.println(" unmatching rule: " + pullTaskTO.getUnmatchingRule()); + printTaskExecTOs(pullTaskTO.getExecutions()); System.out.println(""); } http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/cli/src/main/resources/messages.properties ---------------------------------------------------------------------- diff --git a/client/cli/src/main/resources/messages.properties b/client/cli/src/main/resources/messages.properties index 9ffa1cf..8b5daf2 100644 --- a/client/cli/src/main/resources/messages.properties +++ b/client/cli/src/main/resources/messages.properties @@ -22,13 +22,13 @@ entitlement.help.message=\nUsage: entitlement [options]\n Options:\n --help group.help.message=\nUsage: group [options]\n Options:\n --help \n --details \n --list \n --read \n Syntax: --read {GROUP-ID} {GROUP-ID} [...]\n --read-attr-by-schema-type {GROUP-ID} {SCHEMA-TYPE}\n Schema type: PLAIN / DERIVED / VIRTUAL\n --read-attr-by-schema {GROUP-ID} {SCHEMA-TYPE} {SCHEMA-NAME}\n Schema type: PLAIN / DERIVED / VIRTUAL\n --delete \n Syntax: --delete {GROUP-ID} {GROUP-ID} [...]\n logger.help.message=\nUsage: logger [options]\n Options:\n --help \n --details \n --list \n --read \n Syntax: --read {LOG-NAME} {LOG-NAME} [...]\n --update \n Syntax: --update {LOG-NAME}={LOG-LEVEL} {LOG-NAME}={LOG-LEVEL} [...]\n --update-all \n Syntax: --update-all {LOG-LEVEL} \n --create \n Syntax: --create {LOG-NAME}={LOG-LEVEL} {LOG-NAME}={LOG-LEVEL} [...]\n --delete \n Syntax: --delete {LOG-NAME} {LOG-NAME} [...]\n notification.help.message=\nUsage: notification [options]\n Options:\n --help \n --list \n --read \n Syntax: --read {NOTIFICATION-ID} \n --delete \n Syntax: --delete {NOTIFICATION-ID}\n -policy.help.message=\nUsage: policy [options]\n Options:\n --help \n --details \n --list \n Syntax: --list-policy {POLICY-TYPE} \n Policy type: ACCOUNT / PASSWORD / SYNC / PUSH\n --read \n Syntax: --read {POLICY-ID} {POLICY-ID} [...]\n --delete \n Syntax: --delete {POLICY-ID} {POLICY-ID} [...]\n +policy.help.message=\nUsage: policy [options]\n Options:\n --help \n --details \n --list \n Syntax: --list-policy {POLICY-TYPE} \n Policy type: ACCOUNT / PASSWORD / PULL / PUSH\n --read \n Syntax: --read {POLICY-ID} {POLICY-ID} [...]\n --delete \n Syntax: --delete {POLICY-ID} {POLICY-ID} [...]\n question.help.message=\nUsage: question [options]\n Options:\n --help \n --list \n --read \n Syntax: --read {QUESTION-ID} {QUESTION-ID} [...]\n --delete \n Syntax: --delete {QUESTION-ID} {QUESTION-ID} [...]\n realm.help.message=\nUsage: realm [options]\n Options:\n --help \n --details \n --list \n report.help.message=\nUsage: report [options]\n Options:\n --help \n --details\n --list \n --list-jobs \n --read \n Syntax: --read {REPORT-ID} {REPORT-ID} [...] \n --delete \n Syntax: --delete {REPORT-ID} {REPORT-ID} [...]\n --execute \n Syntax: --execute {REPORT-ID} \n --delete-execution \n Syntax: --delete-execution {EXECUTION-ID} {EXECUTION-ID} [...]\n --export-execution-result \n Syntax: --export-execution-result {EXECUTION-ID} {EXECUTION-ID} [...] {FORMAT}\n Format: CSV / HTML / PDF / XML / RTF\n resource.help.message=\nUsage: resource [options]\n Options:\n --help \n --details \n --list \n --read \n Syntax: --read {RESOURCE-NAME} {RESOURCE-NAME} [...]\n --delete \n Syntax: --delete {RESOURCE-NAME} {RESOURCE-NAME} [...]\n role.help.message=\nUsage: role [options]\n Options:\n --help \n --details \n --list \n --read \n Syntax: --read {ROLE-ID} {ROLE-ID} [...]\n --delete \n Syntax: --delete {ROLE-ID} {ROLE-ID} [...]\n schema.help.message=\nUsage: schema [options]\n Options:\n --help \n --details \n --list-all\n --list-plain\n --list-derived\n --list-virtual\n --read {SCHEMA-TYPE} {SCHEMA-KEY}\n Schema type: PLAIN / DERIVED / VIRTUAL\n --delete {SCHEMA-TYPE} {SCHEMA-KEY}\n Schema type: PLAIN / DERIVED / VIRTUAL\n -task.help.message=\nUsage: task [options]\n Options:\n --help \n --details\n --list\n Syntax: --list {TASK-TYPE} \n Task type: NOTIFICATION / PROPAGATION / PUSH / SCHEDULED / SYNCHRONIZATION\n --list-running-jobs \n --list-scheduled-jobs \n --read \n Syntax: --read {TASK-ID} {TASK-ID} [...]\n --delete \n Syntax: --delete {TASK-ID} {TASK-ID} [...]\n --delete-all-prop\n --delete-execution \n Syntax: --delete-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n --execute \n Syntax: --execute {TASK-ID} {DRY-RUN}\n Dry run: true / false\n +task.help.message=\nUsage: task [options]\n Options:\n --help \n --details\n --list\n Syntax: --list {TASK-TYPE} \n Task type: NOTIFICATION / PROPAGATION / PUSH / SCHEDULED / PULL\n --list-running-jobs \n --list-scheduled-jobs \n --read \n Syntax: --read {TASK-ID} {TASK-ID} [...]\n --delete \n Syntax: --delete {TASK-ID} {TASK-ID} [...]\n --delete-all-prop\n --delete-execution \n Syntax: --delete-execution {TASK-EXEC-ID} {TASK-EXEC-ID} [...]\n --execute \n Syntax: --execute {TASK-ID} {DRY-RUN}\n Dry run: true / false\n user.help.message=\nUsage: user [options]\n Options:\n --help \n --details \n --list \n --get-user-key\n Syntax: --get-user-key {USERNAME}\n --get-username\n Syntax: --get-username {USER-ID}\n --read-by-userid \n Syntax: --read-by-userid {USER-ID} {USER-ID} [...]\n --read-by-username\n Syntax: --read-by-username {USERNAME} {USERNAME} [...]\n --search-by-attribute \n Syntax: --search-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n --search-by-role \n Syntax: --search-by-role {REALM} {ROLE-NAME}\n --search-by-resource \n Syntax: --search-by-resource {REALM} {RESOURCE-NAME}\n --delete \n Syntax: --delete {USER-ID} {USER-ID} [...]\n --delete-all \n Syntax: --delete-all {REALM}\n --delete-by-attribute \n Syntax: --delete-by-attribute {REALM} {ATTR-NAME}={ATTR-VALUE}\n workflow.help.message=\nUsage: workflow [options]\n Options:\n --help \n --export-diagram {ANY-TYPE-KIND}\n Any type kind: ANY_OBJECT / USER / GROUP\n --export-definition {ANY-TYPE-KIND}\n Any type kind: ANY_OBJECT / USER / GROUP\n http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java index 2a508d1..3e0d4a4 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java @@ -102,7 +102,7 @@ public final class Constants { public static final String PREF_SCHED_TASKS_PAGINATOR_ROWS = "schedtasks.paginator.rows"; - public static final String PREF_SYNC_TASKS_PAGINATOR_ROWS = "synctasks.paginator.rows"; + public static final String PREF_PULL_TASKS_PAGINATOR_ROWS = "pulltasks.paginator.rows"; public static final String PREF_PUSH_TASKS_PAGINATOR_ROWS = "pushtasks.paginator.rows"; http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java index 0613296..24fda22 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceMappingPanel.java @@ -178,13 +178,13 @@ public class ResourceMappingPanel extends Panel { } else if (left.getPurpose() != MappingPurpose.BOTH && right.getPurpose() == MappingPurpose.BOTH) { compared = 1; } else if (left.getPurpose() == MappingPurpose.PROPAGATION - && (right.getPurpose() == MappingPurpose.SYNCHRONIZATION + && (right.getPurpose() == MappingPurpose.PULL || right.getPurpose() == MappingPurpose.NONE)) { compared = -1; - } else if (left.getPurpose() == MappingPurpose.SYNCHRONIZATION + } else if (left.getPurpose() == MappingPurpose.PULL && right.getPurpose() == MappingPurpose.PROPAGATION) { compared = 1; - } else if (left.getPurpose() == MappingPurpose.SYNCHRONIZATION + } else if (left.getPurpose() == MappingPurpose.PULL && right.getPurpose() == MappingPurpose.NONE) { compared = -1; } else if (left.getPurpose() == MappingPurpose.NONE http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceSecurityPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceSecurityPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceSecurityPanel.java index 4d90788..ad56e9e 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceSecurityPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceSecurityPanel.java @@ -45,7 +45,7 @@ public class ResourceSecurityPanel extends Panel { private IModel<Map<Long, String>> accountPolicies = null; - private IModel<Map<Long, String>> syncPolicies = null; + private IModel<Map<Long, String>> pullPolicies = null; public ResourceSecurityPanel(final String id, final IModel<ResourceTO> model) { @@ -86,14 +86,14 @@ public class ResourceSecurityPanel extends Panel { } }; - syncPolicies = new LoadableDetachableModel<Map<Long, String>>() { + pullPolicies = new LoadableDetachableModel<Map<Long, String>>() { private static final long serialVersionUID = -2012833443695917883L; @Override protected Map<Long, String> load() { Map<Long, String> res = new HashMap<>(); - for (AbstractPolicyTO policyTO : policyRestClient.getPolicies(PolicyType.SYNC)) { + for (AbstractPolicyTO policyTO : policyRestClient.getPolicies(PolicyType.PULL)) { res.put(policyTO.getKey(), policyTO.getDescription()); } return res; @@ -131,18 +131,18 @@ public class ResourceSecurityPanel extends Panel { // ------------------------------- // ------------------------------- - // Sync policy specification + // Pull policy specification // ------------------------------- - final AjaxDropDownChoicePanel<Long> syncPolicy = new AjaxDropDownChoicePanel<Long>( - "syncPolicy", - new ResourceModel("syncPolicy", "syncPolicy").getObject(), - new PropertyModel<Long>(model, "syncPolicy"), + AjaxDropDownChoicePanel<Long> pullPolicy = new AjaxDropDownChoicePanel<>( + "pullPolicy", + new ResourceModel("pullPolicy", "pullPolicy").getObject(), + new PropertyModel<Long>(model, "pullPolicy"), false); - syncPolicy.setChoiceRenderer(new PolicyRenderer(PolicyType.SYNC)); - syncPolicy.setChoices(new ArrayList<Long>(syncPolicies.getObject().keySet())); - ((DropDownChoice<?>) syncPolicy.getField()).setNullValid(true); - container.add(syncPolicy); + pullPolicy.setChoiceRenderer(new PolicyRenderer(PolicyType.PULL)); + pullPolicy.setChoices(new ArrayList<Long>(pullPolicies.getObject().keySet())); + ((DropDownChoice<?>) pullPolicy.getField()).setNullValid(true); + container.add(pullPolicy); // ------------------------------- } @@ -164,8 +164,8 @@ public class ResourceSecurityPanel extends Panel { return accountPolicies.getObject().get(object); case PASSWORD: return passwordPolicies.getObject().get(object); - case SYNC: - return syncPolicies.getObject().get(object); + case PULL: + return pullPolicies.getObject().get(object); default: return ""; } http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java index 11ec127..0d80b45 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/PolicyRestClient.java @@ -72,7 +72,7 @@ public class PolicyRestClient extends BaseRestClient { Set<String> rules = null; try { - rules = SyncopeConsoleSession.get().getPlatformInfo().getSyncCorrelationRules(); + rules = SyncopeConsoleSession.get().getPlatformInfo().getPullCorrelationRules(); } catch (Exception e) { LOG.error("While getting all correlation rule classes", e); } http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java index 2338911..54bc352 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java @@ -29,7 +29,7 @@ import org.apache.syncope.common.lib.to.NotificationTaskTO; import org.apache.syncope.common.lib.to.PropagationTaskTO; import org.apache.syncope.common.lib.to.PushTaskTO; import org.apache.syncope.common.lib.to.SchedTaskTO; -import org.apache.syncope.common.lib.to.SyncTaskTO; +import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.lib.to.ExecTO; import org.apache.syncope.common.lib.types.TaskType; import org.apache.syncope.common.rest.api.beans.ExecuteQuery; @@ -49,8 +49,8 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien return SyncopeConsoleSession.get().getPlatformInfo().getTaskJobs(); } - public Set<String> getSyncActionsClasses() { - return SyncopeConsoleSession.get().getPlatformInfo().getSyncActions(); + public Set<String> getPullActionsClasses() { + return SyncopeConsoleSession.get().getPlatformInfo().getPullActions(); } public Set<String> getPushActionsClasses() { @@ -126,8 +126,8 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien result = TaskType.NOTIFICATION; } else if (SchedTaskTO.class.equals(reference)) { result = TaskType.SCHEDULED; - } else if (SyncTaskTO.class.equals(reference)) { - result = TaskType.SYNCHRONIZATION; + } else if (PullTaskTO.class.equals(reference)) { + result = TaskType.PULL; } else if (PushTaskTO.class.equals(reference)) { result = TaskType.PUSH; } http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskSearchResultPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskSearchResultPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskSearchResultPanel.java index deb0af5..c0c85e2 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskSearchResultPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskSearchResultPanel.java @@ -26,7 +26,7 @@ import org.apache.syncope.client.console.panels.MultilevelPanel; import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn; 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.SyncTaskTO; +import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.lib.types.TaskType; import org.apache.wicket.PageReference; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; @@ -78,7 +78,7 @@ public abstract class ProvisioningTaskSearchResultPanel<T extends AbstractProvis columns.add(new PropertyColumn<T, String>( new StringResourceModel("description", this, null), "description", "description")); - if (reference == SyncTaskTO.class) { + if (reference == PullTaskTO.class) { columns.add(new PropertyColumn<T, String>( new StringResourceModel("destinationRealm", this, null), "destinationRealm", "destinationRealm")); } http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/java/org/apache/syncope/client/console/tasks/PullTaskSearchResultPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PullTaskSearchResultPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PullTaskSearchResultPanel.java new file mode 100644 index 0000000..dd01779 --- /dev/null +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PullTaskSearchResultPanel.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.syncope.client.console.tasks; + +import org.apache.syncope.client.console.commons.Constants; +import org.apache.syncope.client.console.panels.MultilevelPanel; +import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal; +import org.apache.syncope.common.lib.to.PullTaskTO; +import org.apache.syncope.common.lib.types.TaskType; +import org.apache.wicket.PageReference; + +public abstract class PullTaskSearchResultPanel extends ProvisioningTaskSearchResultPanel<PullTaskTO> { + + private static final long serialVersionUID = 4984337552918213290L; + + protected PullTaskSearchResultPanel( + final BaseModal<?> baseModal, + final MultilevelPanel multiLevelPanelRef, + final String resource, + final PageReference pageRef) { + super(baseModal, multiLevelPanelRef, PullTaskTO.class, resource, pageRef); + } + + @Override + protected String paginatorRowsKey() { + return Constants.PREF_PUSH_TASKS_PAGINATOR_ROWS; + } + + @Override + protected ProvisioningTasksProvider<PullTaskTO> dataProvider() { + return new ProvisioningTasksProvider<>(reference, TaskType.PULL, rows); + } +} http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/java/org/apache/syncope/client/console/tasks/PullTasks.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PullTasks.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PullTasks.java new file mode 100644 index 0000000..559469b --- /dev/null +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PullTasks.java @@ -0,0 +1,53 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.syncope.client.console.tasks; + +import org.apache.syncope.client.console.panels.MultilevelPanel; +import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal; +import org.apache.syncope.common.lib.to.AnyTO; +import org.apache.syncope.common.lib.to.PullTaskTO; +import org.apache.wicket.PageReference; +import org.apache.wicket.ajax.AjaxRequestTarget; +import org.apache.wicket.model.Model; +import org.apache.wicket.model.StringResourceModel; + +public class PullTasks extends AbstractTasks { + + private static final long serialVersionUID = -4013796607157549641L; + + public <T extends AnyTO> PullTasks( + final BaseModal<?> baseModal, final PageReference pageReference, final String resource) { + super(BaseModal.CONTENT_ID); + + final MultilevelPanel mlp = new MultilevelPanel("tasks"); + add(mlp); + + mlp.setFirstLevel(new PullTaskSearchResultPanel(baseModal, mlp, resource, pageReference) { + + private static final long serialVersionUID = -2195387360323687302L; + + @Override + protected void viewTask(final PullTaskTO taskTO, final AjaxRequestTarget target) { + mlp.next( + new StringResourceModel("task.view", this, new Model<>(taskTO)).getObject(), + new TaskExecutionDetails<>(baseModal, taskTO, pageReference), target); + } + }); + } +} http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java index b7bd69c..6fc3fdd 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder.java @@ -31,9 +31,9 @@ import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPa import org.apache.syncope.client.console.wizards.AjaxWizardBuilder; import org.apache.syncope.common.lib.to.AbstractProvisioningTaskTO; import org.apache.syncope.common.lib.to.SchedTaskTO; -import org.apache.syncope.common.lib.to.SyncTaskTO; +import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.lib.types.MatchingRule; -import org.apache.syncope.common.lib.types.SyncMode; +import org.apache.syncope.common.lib.types.PullMode; import org.apache.syncope.common.lib.types.UnmatchingRule; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -107,42 +107,42 @@ public class SchedTaskWizardBuilder<T extends SchedTaskTO> extends AjaxWizardBui new PropertyModel<Boolean>(taskTO, "active"), false); add(active); - final WebMarkupContainer syncTaskSpecifics = new WebMarkupContainer("syncTaskSpecifics"); - add(syncTaskSpecifics.setRenderBodyOnly(true)); + final WebMarkupContainer pullTaskSpecifics = new WebMarkupContainer("pullTaskSpecifics"); + add(pullTaskSpecifics.setRenderBodyOnly(true)); boolean isFiltered = false; - if (taskTO instanceof SyncTaskTO) { - isFiltered = SyncTaskTO.class.cast(taskTO).getSyncMode() == SyncMode.FILTERED_RECONCILIATION; + if (taskTO instanceof PullTaskTO) { + isFiltered = PullTaskTO.class.cast(taskTO).getPullMode() == PullMode.FILTERED_RECONCILIATION; } else { - syncTaskSpecifics.setEnabled(false).setVisible(false); + pullTaskSpecifics.setEnabled(false).setVisible(false); } - final AjaxDropDownChoicePanel<SyncMode> syncMode = new AjaxDropDownChoicePanel<>("syncMode", "syncMode", - new PropertyModel<SyncMode>(taskTO, "syncMode"), false); - syncTaskSpecifics.add(syncMode); - syncMode.setChoices(Arrays.asList(SyncMode.values())); + final AjaxDropDownChoicePanel<PullMode> pullMode = new AjaxDropDownChoicePanel<>("pullMode", "pullMode", + new PropertyModel<PullMode>(taskTO, "pullMode"), false); + pullTaskSpecifics.add(pullMode); + pullMode.setChoices(Arrays.asList(PullMode.values())); final AjaxTextFieldPanel filter = new AjaxTextFieldPanel( "reconciliationFilterBuilderClassName", "reconciliationFilterBuilderClassName", new PropertyModel<String>(taskTO, "reconciliationFilterBuilderClassName"), false); - syncTaskSpecifics.add(filter); + pullTaskSpecifics.add(filter); filter.setEnabled(isFiltered); - syncMode.getField().add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) { + pullMode.getField().add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) { private static final long serialVersionUID = -1107858522700306810L; @Override protected void onUpdate(final AjaxRequestTarget target) { - filter.setEnabled(syncMode.getModelObject() == SyncMode.FILTERED_RECONCILIATION); + filter.setEnabled(pullMode.getModelObject() == PullMode.FILTERED_RECONCILIATION); target.add(filter); } }); final AjaxTextFieldPanel destinationRealm = new AjaxTextFieldPanel("destinationRealm", "destinationRealm", new PropertyModel<String>(taskTO, "destinationRealm"), false); - syncTaskSpecifics.add(destinationRealm); + pullTaskSpecifics.add(destinationRealm); final AjaxDropDownChoicePanel<String> className = new AjaxDropDownChoicePanel<>( "jobDelegateClassName", @@ -181,9 +181,9 @@ public class SchedTaskWizardBuilder<T extends SchedTaskTO> extends AjaxWizardBui "performDelete", "performDelete", new PropertyModel<Boolean>(taskTO, "performDelete"), false); provisioningTaskSpecifics.add(performDelete); - final AjaxCheckBoxPanel syncStatus = new AjaxCheckBoxPanel( - "syncStatus", "syncStatus", new PropertyModel<Boolean>(taskTO, "syncStatus"), false); - provisioningTaskSpecifics.add(syncStatus); + final AjaxCheckBoxPanel pullStatus = new AjaxCheckBoxPanel( + "pullStatus", "pullStatus", new PropertyModel<Boolean>(taskTO, "pullStatus"), false); + provisioningTaskSpecifics.add(pullStatus); if (taskTO instanceof AbstractProvisioningTaskTO) { className.setEnabled(false).setVisible(false); http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/java/org/apache/syncope/client/console/tasks/SyncTaskSearchResultPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SyncTaskSearchResultPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SyncTaskSearchResultPanel.java deleted file mode 100644 index b0b4f4c..0000000 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SyncTaskSearchResultPanel.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.syncope.client.console.tasks; - -import org.apache.syncope.client.console.commons.Constants; -import org.apache.syncope.client.console.panels.MultilevelPanel; -import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal; -import org.apache.syncope.common.lib.to.SyncTaskTO; -import org.apache.syncope.common.lib.types.TaskType; -import org.apache.wicket.PageReference; - -/** - * Sync Tasks page. - */ -public abstract class SyncTaskSearchResultPanel extends ProvisioningTaskSearchResultPanel<SyncTaskTO> { - - private static final long serialVersionUID = 4984337552918213290L; - - protected SyncTaskSearchResultPanel( - final BaseModal<?> baseModal, - final MultilevelPanel multiLevelPanelRef, - final String resource, - final PageReference pageRef) { - super(baseModal, multiLevelPanelRef, SyncTaskTO.class, resource, pageRef); - } - - @Override - protected String paginatorRowsKey() { - return Constants.PREF_PUSH_TASKS_PAGINATOR_ROWS; - } - - @Override - protected ProvisioningTasksProvider<SyncTaskTO> dataProvider() { - return new ProvisioningTasksProvider<>(reference, TaskType.SYNCHRONIZATION, rows); - } -} http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/java/org/apache/syncope/client/console/tasks/SyncTasks.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SyncTasks.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SyncTasks.java deleted file mode 100644 index b03af35..0000000 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SyncTasks.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.syncope.client.console.tasks; - -import org.apache.syncope.client.console.panels.MultilevelPanel; -import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal; -import org.apache.syncope.common.lib.to.AnyTO; -import org.apache.syncope.common.lib.to.SyncTaskTO; -import org.apache.wicket.PageReference; -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.model.Model; -import org.apache.wicket.model.StringResourceModel; - -public class SyncTasks extends AbstractTasks { - - private static final long serialVersionUID = -4013796607157549641L; - - public <T extends AnyTO> SyncTasks( - final BaseModal<?> baseModal, final PageReference pageReference, final String resource) { - super(BaseModal.CONTENT_ID); - - final MultilevelPanel mlp = new MultilevelPanel("tasks"); - add(mlp); - - mlp.setFirstLevel(new SyncTaskSearchResultPanel(baseModal, mlp, resource, pageReference) { - - private static final long serialVersionUID = -2195387360323687302L; - - @Override - protected void viewTask(final SyncTaskTO taskTO, final AjaxRequestTarget target) { - mlp.next( - new StringResourceModel("task.view", this, new Model<>(taskTO)).getObject(), - new TaskExecutionDetails<>(baseModal, taskTO, pageReference), target); - } - }); - } -} http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java index 48f2588..fd495c5 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java @@ -32,7 +32,7 @@ import org.apache.syncope.client.console.rest.ResourceRestClient; import org.apache.syncope.client.console.tasks.PropagationTasks; import org.apache.syncope.client.console.tasks.PushTasks; import org.apache.syncope.client.console.tasks.SchedTasks; -import org.apache.syncope.client.console.tasks.SyncTasks; +import org.apache.syncope.client.console.tasks.PullTasks; import org.apache.syncope.client.console.wicket.markup.html.bootstrap.confirmation.ConfirmationModalBehavior; import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal; import org.apache.syncope.common.lib.SyncopeClientException; @@ -318,19 +318,19 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> { fragment.add(propagation); MetaDataRoleAuthorizationStrategy.authorize(propagation, ENABLE, StandardEntitlement.TASK_LIST); - final AjaxLink<String> synchronization = new IndicatingAjaxLink<String>("synchronization") { + final AjaxLink<String> pull = new IndicatingAjaxLink<String>("pull") { private static final long serialVersionUID = 3776750333491622263L; @Override public void onClick(final AjaxRequestTarget target) { - target.add(taskModal.setContent(new SyncTasks(taskModal, pageRef, node.getKey().toString()))); - taskModal.header(new ResourceModel("task.synchronization.list", "Synchronization tasks")); + target.add(taskModal.setContent(new PullTasks(taskModal, pageRef, node.getKey().toString()))); + taskModal.header(new ResourceModel("task.pull.list")); taskModal.show(true); } }; - fragment.add(synchronization); - MetaDataRoleAuthorizationStrategy.authorize(synchronization, ENABLE, StandardEntitlement.TASK_LIST); + fragment.add(pull); + MetaDataRoleAuthorizationStrategy.authorize(pull, ENABLE, StandardEntitlement.TASK_LIST); final AjaxLink<String> push = new IndicatingAjaxLink<String>("push") { http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MappingPurposePanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MappingPurposePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MappingPurposePanel.java index 2c41f37..f5d43a6 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MappingPurposePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/MappingPurposePanel.java @@ -33,7 +33,7 @@ public class MappingPurposePanel extends Panel { private final AjaxLink<Void> propagation; - private final AjaxLink<Void> synchronization; + private final AjaxLink<Void> pull; private final AjaxLink<Void> both; @@ -56,14 +56,14 @@ public class MappingPurposePanel extends Panel { } }; - synchronization = new AjaxLink<Void>("synchronizationPurposeLink") { + pull = new AjaxLink<Void>("pullPurposeLink") { private static final long serialVersionUID = -6957616042924610305L; @Override public void onClick(final AjaxRequestTarget target) { - model.setObject(MappingPurpose.SYNCHRONIZATION); - setOpacity(MappingPurpose.SYNCHRONIZATION); + model.setObject(MappingPurpose.PULL); + setOpacity(MappingPurpose.PULL); target.add(container); } }; @@ -93,7 +93,7 @@ public class MappingPurposePanel extends Panel { }; add(propagation); - add(synchronization); + add(pull); add(both); add(none); @@ -104,28 +104,32 @@ public class MappingPurposePanel extends Panel { switch (mappingPurpose) { case PROPAGATION: propagation.add(new AttributeModifier("style", new Model<String>("opacity: 1;"))); - synchronization.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); + pull.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); both.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); none.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); break; - case SYNCHRONIZATION: - synchronization.add(new AttributeModifier("style", new Model<String>("opacity: 1;"))); + + case PULL: + pull.add(new AttributeModifier("style", new Model<String>("opacity: 1;"))); propagation.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); both.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); none.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); break; + case BOTH: both.add(new AttributeModifier("style", new Model<String>("opacity: 1;"))); propagation.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); - synchronization.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); + pull.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); none.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); break; + case NONE: none.add(new AttributeModifier("style", new Model<String>("opacity: 1;"))); - synchronization.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); + pull.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); propagation.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); both.add(new AttributeModifier("style", new Model<String>("opacity: 0.3;"))); break; + default: // do nothing } http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.properties index 351d029..fd3fdce 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal.properties @@ -49,7 +49,7 @@ enable=Enable createTraceLevel=Create trace level updateTraceLevel=Update trace level deleteTraceLevel=Delete trace level -syncTraceLevel=Synchronization trace level +pullTraceLevel=Pull trace level propagationPriority=Propagation priority success_connection=Successful connection http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_it.properties index 51cf18e..6c219f3 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_it.properties @@ -48,7 +48,7 @@ enable=Abilita createTraceLevel=Livello di tracciamento delle creazioni updateTraceLevel=Livello di tracciamento degli aggiornamenti deleteTraceLevel=Livello di tracciamento delle cancellazioni -syncTraceLevel=Livello di tracciamento delle sincronizzazioni +pullTraceLevel=Livello di tracciamento delle pull propagationPriority=Priorit\u00e0 in propagazione success_connection=Connessione avvenuta con successo http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_pt_BR.properties index 07e0f14..4b2f0a0 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceModal_pt_BR.properties @@ -48,7 +48,7 @@ enable=Habilitado createTraceLevel=Criar n\u00edvel de trace updateTraceLevel=Atualizar n\u00edvel de trace deleteTraceLevel=Excluir n\u00edvel de trace -syncTraceLevel=N\u00edvel de trace de sincroniza\u00e7\u00e3o +pullTraceLevel=N\u00edvel de trace de pull propagationPriority=Prioridade de propaga\u00e7\u00e3o success_connection=Conex\u00e3o com sucesso http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel.html index 10cfb54..f39d19e 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel.html @@ -25,7 +25,7 @@ under the License. <span wicket:id="accountPolicy"> [panel for dynamic input type markup] </span> - <span wicket:id="syncPolicy"> + <span wicket:id="pullPolicy"> [panel for dynamic input type markup] </span> </div> http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel.properties index f7fd440..279e499 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel.properties @@ -16,4 +16,4 @@ # under the License. passwordPolicy = Password Policy accountPolicy = Account Policy -syncPolicy = Sync Policy +pullPolicy=Pull Policy http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel_it.properties index f7fd440..279e499 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel_it.properties @@ -16,4 +16,4 @@ # under the License. passwordPolicy = Password Policy accountPolicy = Account Policy -syncPolicy = Sync Policy +pullPolicy=Pull Policy http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel_pt_BR.properties index 3278665..4c774d5 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceSecurityPanel_pt_BR.properties @@ -16,4 +16,4 @@ # under the License. passwordPolicy = Pol\u00edtica de Senha accountPolicy = Pol\u00edtica de Conta -syncPolicy = Pol\u00edtica de Sincroniza\u00e7\u00e3o +pullPolicy=Pol\u00edtica de Pull
