Repository: syncope Updated Branches: refs/heads/master 40288e97c -> 61a7fdd38
http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java ---------------------------------------------------------------------- diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java index b67ae4e..60bb75b 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/VirAttrITCase.java @@ -230,13 +230,13 @@ public class VirAttrITCase extends AbstractITCase { JdbcTemplate jdbcTemplate = new JdbcTemplate(testDataSource); String value = jdbcTemplate.queryForObject( - "SELECT USERNAME FROM testsync WHERE ID=?", String.class, actual.getKey()); + "SELECT USERNAME FROM testpull WHERE ID=?", String.class, actual.getKey()); assertEquals("virattrcache", value); - jdbcTemplate.update("UPDATE testsync set USERNAME='virattrcache2' WHERE ID=?", actual.getKey()); + jdbcTemplate.update("UPDATE testpull set USERNAME='virattrcache2' WHERE ID=?", actual.getKey()); value = jdbcTemplate.queryForObject( - "SELECT USERNAME FROM testsync WHERE ID=?", String.class, actual.getKey()); + "SELECT USERNAME FROM testpull WHERE ID=?", String.class, actual.getKey()); assertEquals("virattrcache2", value); // 4. check for cached attribute value @@ -393,13 +393,13 @@ public class VirAttrITCase extends AbstractITCase { JdbcTemplate jdbcTemplate = new JdbcTemplate(testDataSource); String value = jdbcTemplate.queryForObject( - "SELECT USERNAME FROM testsync WHERE ID=?", String.class, userTO.getKey()); + "SELECT USERNAME FROM testpull WHERE ID=?", String.class, userTO.getKey()); assertEquals("virattrcache", value); - jdbcTemplate.update("UPDATE testsync set USERNAME='virattrcache2' WHERE ID=?", userTO.getKey()); + jdbcTemplate.update("UPDATE testpull set USERNAME='virattrcache2' WHERE ID=?", userTO.getKey()); value = jdbcTemplate.queryForObject( - "SELECT USERNAME FROM testsync WHERE ID=?", String.class, userTO.getKey()); + "SELECT USERNAME FROM testpull WHERE ID=?", String.class, userTO.getKey()); assertEquals("virattrcache2", value); // ---------------------------------------- @@ -557,7 +557,7 @@ public class VirAttrITCase extends AbstractITCase { JdbcTemplate jdbcTemplate = new JdbcTemplate(testDataSource); Map<String, Object> actuals = jdbcTemplate.queryForMap( - "SELECT id, surname, email FROM testsync WHERE id=?", + "SELECT id, surname, email FROM testpull WHERE id=?", new Object[] { Integer.parseInt(userTO.getPlainAttrMap().get("aLong").getValues().get(0)) }); assertEquals(userTO.getPlainAttrMap().get("aLong").getValues().get(0), actuals.get("id").toString()); http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/src/main/asciidoc/concepts/concepts.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/concepts/concepts.adoc b/src/main/asciidoc/concepts/concepts.adoc index c781e50..2e63820 100644 --- a/src/main/asciidoc/concepts/concepts.adoc +++ b/src/main/asciidoc/concepts/concepts.adoc @@ -42,7 +42,7 @@ include::provisioning/provisioning.adoc[] ==== Push -==== Synchronization +==== Pull === Workflow and Approval @@ -52,4 +52,4 @@ include::provisioning/provisioning.adoc[] === Audit -=== Delegated Administration \ No newline at end of file +=== Delegated Administration http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/src/main/asciidoc/concepts/provisioning/provisioning.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/concepts/provisioning/provisioning.adoc b/src/main/asciidoc/concepts/provisioning/provisioning.adoc index 35f5987..8a623e1 100644 --- a/src/main/asciidoc/concepts/provisioning/provisioning.adoc +++ b/src/main/asciidoc/concepts/provisioning/provisioning.adoc @@ -22,8 +22,8 @@ User and role provisioning refers to the creation, maintenance, activation and d and their attributes. Provisioning operations can act on Apache Syncope only or be propagated towards external resources as well. The provisioning operation can be initiated by an authorized user (for instance, working on Apache Syncope -administration console) or by an internal task like a synchronization task. -A synchronization task can be used to perform a bulk provisioning operation involving either Syncope and one +administration console) or by an internal task like a pull task. +A push task can be used to perform a bulk provisioning operation involving either Syncope and one or more external resources. include::connectors.adoc[] @@ -34,4 +34,4 @@ include::propagation.adoc[] include::push.adoc[] -include::sync.adoc[] \ No newline at end of file +include::pull.adoc[] \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/src/main/asciidoc/concepts/provisioning/pull.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/concepts/provisioning/pull.adoc b/src/main/asciidoc/concepts/provisioning/pull.adoc new file mode 100644 index 0000000..bf2157a --- /dev/null +++ b/src/main/asciidoc/concepts/provisioning/pull.adoc @@ -0,0 +1,52 @@ +// +// 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. +// +==== Pull +Basically, pull is the mechanism used by Apache Syncope to acquire user, group and any objects data from external resources. +Pull can be "full" (full reconciliation) or "incremental". +In the former case, each pull task execution will take over just of changes from the previous execution +(if exists and connector permits incremental pull). +In the latter case, each pull task execution will take over of the entire set of data managed by the external resource. + +===== From an external resource to Syncope +All the entity (user/group) data involved by a pull are retrieved from an external resource and processed +internally by Syncope itself. +A retrieved entity can be: + +. a matching entity, if a corresponding local/internal entity has been found; +. or an unmatching entity, otherwise. + +By default, Syncope will create locally all the unmatching entities (without linking entities and resources) and will +update all the matching ones. +By the way, a different behaviour can be configured working with matching/unmatching rules. + +===== Matching and Unmatching rules +Unmatching (corresponding user not found on Syncope): + +* IGNORE / UNLINK (do not perform any action); +* ASSIGN (create entity linking the resource); +* PROVISION (create entity without linking the resource). + +Matching (corresponding users found on Syncope): + +* IGNORE (do not perform any action); +* UPDATE (update matching entity); +* DEPROVISION (delete resource entity); +* UNASSIGN (unlink resource and delete resource entity) ; +* UNLINK (just unlink resource without performing any (de-)provisioning operation); +* LINK (just link resource without performing any (de-)provisioning operation). \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/src/main/asciidoc/concepts/provisioning/resources.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/concepts/provisioning/resources.adoc b/src/main/asciidoc/concepts/provisioning/resources.adoc index b9b7070..03c78af 100644 --- a/src/main/asciidoc/concepts/provisioning/resources.adoc +++ b/src/main/asciidoc/concepts/provisioning/resources.adoc @@ -32,7 +32,7 @@ to that resource. Users and roles can be assigned to an external resource by defining a direct or indirect link between objects. By the way, Apache Syncope empowers the possibility to control the existence of users/roles on external resources giving the possibility to manage remote provisioning directly. -In fact, an authorized user (or an internal task - a sync task, for instance) can ask for +In fact, an authorized user (or an internal task - a pull task, for instance) can ask for * *link / unlink* users/roles to/from specific resources (soft link), * *assign / unassign* users/roles to/from specific resources (hard link), @@ -48,4 +48,4 @@ of reclaims. Assign/Unassign:: Apache Syncope gives the possibility to create and remove a sort of hard linking between users/roles and resources. This kind of link implies propagation at link creation/deletion time: it is the composition between link/unlink and -provision/de-provision operations. \ No newline at end of file +provision/de-provision operations. http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/src/main/asciidoc/concepts/provisioning/sync.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/concepts/provisioning/sync.adoc b/src/main/asciidoc/concepts/provisioning/sync.adoc deleted file mode 100644 index 7bc130f..0000000 --- a/src/main/asciidoc/concepts/provisioning/sync.adoc +++ /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. -// -==== Synchronization -Basically, the synchronization is the mechanism used by Apache Syncope to acquire user/group data from external resources. -Synchronization can be "full" (full reconciliation) or "incremental". -In the former case, each sync task execution will take over just of changes from the previous execution -(if exists and connector permits incremental sync). -In the latter case, each sync task execution will take over of the entire set of data managed by the external resource. - -===== From an external resource to Syncope -All the entity (user/group) data involved by a synchronization are retrieved from an external resource and processed -internally by Syncope itself. -A retrieved entity can be: - -. a matching entity, if a corresponding local/internal entity has been found; -. or an unmatching entity, otherwise. - -By default, Syncope will create locally all the unmatching entities (without linking entities and resources) and will -update all the matching ones. -By the way, a different behaviour can be configured working with matching/unmatching rules. - -===== Matching and Unmatching rules -Unmatching (corresponding user not found on Syncope): - -* IGNORE / UNLINK (do not perform any action); -* ASSIGN (create entity linking the resource); -* PROVISION (create entity without linking the resource). - -Matching (corresponding users found on Syncope): - -* IGNORE (do not perform any action); -* UPDATE (update matching entity); -* DEPROVISION (delete resource entity); -* UNASSIGN (unlink resource and delete resource entity) ; -* UNLINK (just unlink resource without performing any (de-)provisioning operation); -* LINK (just link resource without performing any (de-)provisioning operation). \ No newline at end of file http://git-wip-us.apache.org/repos/asf/syncope/blob/61a7fdd3/src/main/asciidoc/workingwithapachesyncope/cli/task.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/workingwithapachesyncope/cli/task.adoc b/src/main/asciidoc/workingwithapachesyncope/cli/task.adoc index 5572442..9889956 100644 --- a/src/main/asciidoc/workingwithapachesyncope/cli/task.adoc +++ b/src/main/asciidoc/workingwithapachesyncope/cli/task.adoc @@ -29,7 +29,7 @@ Usage: task [options] --details --list Syntax: --list {TASK-TYPE} - Task type: NOTIFICATION / PROPAGATION / PUSH / SCHEDULED / SYNCHRONIZATION + Task type: NOTIFICATION / PROPAGATION / PUSH / SCHEDULED / PULL --list-running-jobs --list-scheduled-jobs --read
