http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AnyObjectPushResultHandlerImpl.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AnyObjectPushResultHandlerImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AnyObjectPushResultHandlerImpl.java
index 0a276ab..755e818 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AnyObjectPushResultHandlerImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AnyObjectPushResultHandlerImpl.java
@@ -18,103 +18,21 @@
  */
 package org.apache.syncope.core.provisioning.java.sync;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.common.lib.patch.AnyObjectPatch;
-import org.apache.syncope.common.lib.patch.StringPatchItem;
+import org.apache.syncope.common.lib.patch.AnyPatch;
 import org.apache.syncope.common.lib.to.AnyTO;
-import org.apache.syncope.common.lib.to.AnyObjectTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.common.lib.types.PatchOperation;
-import org.apache.syncope.common.lib.types.PropagationByResource;
-import org.apache.syncope.common.lib.types.ResourceOperation;
 import org.apache.syncope.core.persistence.api.entity.Any;
 import org.apache.syncope.core.persistence.api.entity.AnyUtils;
-import org.apache.syncope.core.persistence.api.entity.anyobject.AnyObject;
-import org.apache.syncope.core.persistence.api.entity.resource.MappingItem;
-import org.apache.syncope.core.provisioning.api.TimeoutException;
+import org.apache.syncope.core.provisioning.api.WorkflowResult;
 import 
org.apache.syncope.core.provisioning.api.sync.AnyObjectPushResultHandler;
-import org.identityconnectors.framework.common.objects.ConnectorObject;
-import org.identityconnectors.framework.common.objects.ObjectClass;
-import org.identityconnectors.framework.common.objects.Uid;
 
 public class AnyObjectPushResultHandlerImpl extends AbstractPushResultHandler 
implements AnyObjectPushResultHandler {
 
     @Override
     protected AnyUtils getAnyUtils() {
-        return anyUtilsFactory.getInstance(AnyTypeKind.GROUP);
-    }
-
-    @Override
-    protected Any<?, ?, ?> deprovision(final Any<?, ?, ?> sbj) {
-        AnyObjectTO before = 
anyObjectDataBinder.getAnyObjectTO(AnyObject.class.cast(sbj), true);
-
-        List<String> noPropResources = new ArrayList<>(before.getResources());
-        noPropResources.remove(profile.getTask().getResource().getKey());
-
-        
taskExecutor.execute(propagationManager.getAnyObjectDeleteTasks(before.getKey(),
 noPropResources));
-
-        return anyObjectDAO.authFind(before.getKey());
-    }
-
-    @Override
-    protected Any<?, ?, ?> provision(final Any<?, ?, ?> sbj, final Boolean 
enabled) {
-        AnyObjectTO before = 
anyObjectDataBinder.getAnyObjectTO(AnyObject.class.cast(sbj), true);
-
-        List<String> noPropResources = new ArrayList<>(before.getResources());
-        noPropResources.remove(profile.getTask().getResource().getKey());
-
-        PropagationByResource propByRes = new PropagationByResource();
-        propByRes.add(ResourceOperation.CREATE, 
profile.getTask().getResource().getKey());
-
-        taskExecutor.execute(propagationManager.getAnyObjectCreateTasks(
-                before.getKey(),
-                Collections.unmodifiableCollection(before.getVirAttrs()),
-                propByRes,
-                noPropResources));
-
-        return anyObjectDAO.authFind(before.getKey());
-    }
-
-    @Override
-    protected Any<?, ?, ?> link(final Any<?, ?, ?> sbj, final Boolean unlink) {
-        AnyObjectPatch anyObjectPatch = new AnyObjectPatch();
-        anyObjectPatch.setKey(sbj.getKey());
-        anyObjectPatch.getResources().add(new StringPatchItem.Builder().
-                operation(unlink ? PatchOperation.DELETE : 
PatchOperation.ADD_REPLACE).
-                value(profile.getTask().getResource().getKey()).build());
-
-        awfAdapter.update(anyObjectPatch);
-
-        return anyObjectDAO.authFind(sbj.getKey());
-    }
-
-    @Override
-    protected Any<?, ?, ?> unassign(final Any<?, ?, ?> sbj) {
-        AnyObjectPatch anyObjectPatch = new AnyObjectPatch();
-        anyObjectPatch.setKey(sbj.getKey());
-        anyObjectPatch.getResources().add(new StringPatchItem.Builder().
-                operation(PatchOperation.DELETE).
-                value(profile.getTask().getResource().getKey()).build());
-
-        awfAdapter.update(anyObjectPatch);
-
-        return deprovision(sbj);
-    }
-
-    @Override
-    protected Any<?, ?, ?> assign(final Any<?, ?, ?> sbj, final Boolean 
enabled) {
-        AnyObjectPatch anyObjectPatch = new AnyObjectPatch();
-        anyObjectPatch.setKey(sbj.getKey());
-        anyObjectPatch.getResources().add(new StringPatchItem.Builder().
-                operation(PatchOperation.ADD_REPLACE).
-                value(profile.getTask().getResource().getKey()).build());
-
-        awfAdapter.update(anyObjectPatch);
-
-        return provision(sbj, enabled);
+        return anyUtilsFactory.getInstance(AnyTypeKind.ANY_OBJECT);
     }
 
     @Override
@@ -123,16 +41,6 @@ public class AnyObjectPushResultHandlerImpl extends 
AbstractPushResultHandler im
     }
 
     @Override
-    protected AnyTO getAnyTO(final long key) {
-        try {
-            return anyObjectDataBinder.getAnyObjectTO(key);
-        } catch (Exception e) {
-            LOG.warn("Error retrieving user {}", key, e);
-            return null;
-        }
-    }
-
-    @Override
     protected Any<?, ?, ?> getAny(final long key) {
         try {
             return anyObjectDAO.authFind(key);
@@ -143,22 +51,20 @@ public class AnyObjectPushResultHandlerImpl extends 
AbstractPushResultHandler im
     }
 
     @Override
-    protected ConnectorObject getRemoteObject(final String connObjectKey, 
final ObjectClass objectClass) {
-        ConnectorObject obj = null;
-        try {
-            Uid uid = new Uid(connObjectKey);
+    protected AnyTO getAnyTO(final long key) {
+        return anyObjectDataBinder.getAnyObjectTO(key);
+    }
 
-            obj = profile.getConnector().getObject(
-                    objectClass,
-                    uid,
-                    
profile.getConnector().getOperationOptions(Collections.<MappingItem>emptySet()));
-        } catch (TimeoutException toe) {
-            LOG.debug("Request timeout", toe);
-            throw toe;
-        } catch (RuntimeException ignore) {
-            LOG.debug("While resolving {}", connObjectKey, ignore);
-        }
+    @Override
+    protected AnyPatch newPatch(final long key) {
+        AnyObjectPatch patch = new AnyObjectPatch();
+        patch.setKey(key);
+        return patch;
+    }
 
-        return obj;
+    @Override
+    protected WorkflowResult<Long> update(final AnyPatch patch) {
+        return awfAdapter.update((AnyObjectPatch) patch);
     }
+
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AnyObjectSyncResultHandlerImpl.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AnyObjectSyncResultHandlerImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AnyObjectSyncResultHandlerImpl.java
index 0227c87..02f0b67 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AnyObjectSyncResultHandlerImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/AnyObjectSyncResultHandlerImpl.java
@@ -24,13 +24,14 @@ import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.common.lib.patch.AnyObjectPatch;
 import org.apache.syncope.common.lib.patch.AnyPatch;
-import org.apache.syncope.common.lib.patch.StringPatchItem;
 import org.apache.syncope.common.lib.to.AnyTO;
 import org.apache.syncope.common.lib.to.PropagationStatus;
 import org.apache.syncope.common.lib.to.AnyObjectTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.common.lib.types.PatchOperation;
+import org.apache.syncope.core.persistence.api.entity.Any;
 import org.apache.syncope.core.persistence.api.entity.AnyUtils;
+import org.apache.syncope.core.provisioning.api.ProvisioningManager;
+import org.apache.syncope.core.provisioning.api.WorkflowResult;
 import org.apache.syncope.core.provisioning.api.sync.ProvisioningResult;
 import 
org.apache.syncope.core.provisioning.api.sync.AnyObjectSyncResultHandler;
 import org.identityconnectors.framework.common.objects.SyncDelta;
@@ -48,9 +49,14 @@ public class AnyObjectSyncResultHandlerImpl extends 
AbstractSyncResultHandler im
     }
 
     @Override
-    protected AnyTO getAnyTO(final long key) {
+    protected ProvisioningManager<?, ?> getProvisioningManager() {
+        return anyObjectProvisioningManager;
+    }
+
+    @Override
+    protected Any<?, ?, ?> getAny(final long key) {
         try {
-            return anyObjectDataBinder.getAnyObjectTO(key);
+            return anyObjectDAO.authFind(key);
         } catch (Exception e) {
             LOG.warn("Error retrieving anyObject {}", key, e);
             return null;
@@ -58,33 +64,33 @@ public class AnyObjectSyncResultHandlerImpl extends 
AbstractSyncResultHandler im
     }
 
     @Override
+    protected AnyTO getAnyTO(final long key) {
+        return anyObjectDataBinder.getAnyObjectTO(key);
+    }
+
+    @Override
+    protected AnyPatch newPatch(final long key) {
+        AnyObjectPatch patch = new AnyObjectPatch();
+        patch.setKey(key);
+        return patch;
+    }
+
+    @Override
+    protected WorkflowResult<Long> update(final AnyPatch patch) {
+        return awfAdapter.update((AnyObjectPatch) patch);
+    }
+
+    @Override
     protected AnyTO doCreate(final AnyTO anyTO, final SyncDelta delta, final 
ProvisioningResult result) {
         AnyObjectTO anyObjectTO = AnyObjectTO.class.cast(anyTO);
 
         Map.Entry<Long, List<PropagationStatus>> created = 
anyObjectProvisioningManager.create(
                 anyObjectTO, 
Collections.singleton(profile.getTask().getResource().getKey()));
 
-        anyObjectTO = anyObjectDataBinder.getAnyObjectTO(created.getKey());
-
         result.setKey(created.getKey());
         result.setName(getName(anyTO));
 
-        return anyObjectTO;
-    }
-
-    @Override
-    protected AnyTO doLink(
-            final AnyTO before,
-            final ProvisioningResult result,
-            final boolean unlink) {
-
-        AnyObjectPatch anyObjectPatch = new AnyObjectPatch();
-        anyObjectPatch.setKey(before.getKey());
-        anyObjectPatch.getResources().add(new StringPatchItem.Builder().
-                operation(unlink ? PatchOperation.DELETE : 
PatchOperation.ADD_REPLACE).
-                value(profile.getTask().getResource().getKey()).build());
-
-        return 
anyObjectDataBinder.getAnyObjectTO(awfAdapter.update(anyObjectPatch).getResult());
+        return getAnyTO(created.getKey());
     }
 
     @Override
@@ -102,32 +108,4 @@ public class AnyObjectSyncResultHandlerImpl extends 
AbstractSyncResultHandler im
         result.setName(getName(after));
         return after;
     }
-
-    @Override
-    protected void doDeprovision(final Long key, final boolean unlink) {
-        taskExecutor.execute(propagationManager.getAnyObjectDeleteTasks(
-                key, profile.getTask().getResource().getKey()));
-
-        if (unlink) {
-            AnyObjectPatch anyObjectPatch = new AnyObjectPatch();
-            anyObjectPatch.setKey(key);
-            anyObjectPatch.getResources().add(new StringPatchItem.Builder().
-                    operation(PatchOperation.DELETE).
-                    value(profile.getTask().getResource().getKey()).build());
-        }
-    }
-
-    @Override
-    protected void doDelete(final Long key) {
-        try {
-            taskExecutor.execute(propagationManager.getAnyObjectDeleteTasks(
-                    key, profile.getTask().getResource().getKey()));
-        } catch (Exception e) {
-            // A propagation failure doesn't imply a synchronization failure.
-            // The propagation exception status will be reported into the 
propagation task execution.
-            LOG.error("Could not propagate anyObject " + key, e);
-        }
-
-        anyObjectProvisioningManager.delete(key);
-    }
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/GroupPushResultHandlerImpl.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/GroupPushResultHandlerImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/GroupPushResultHandlerImpl.java
index 44a034b..2fd1df7 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/GroupPushResultHandlerImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/GroupPushResultHandlerImpl.java
@@ -18,26 +18,15 @@
  */
 package org.apache.syncope.core.provisioning.java.sync;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 import org.apache.syncope.common.lib.patch.GroupPatch;
-import org.apache.syncope.common.lib.patch.StringPatchItem;
+import org.apache.syncope.common.lib.patch.AnyPatch;
 import org.apache.syncope.common.lib.to.AnyTO;
-import org.apache.syncope.common.lib.to.GroupTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.common.lib.types.PatchOperation;
-import org.apache.syncope.common.lib.types.PropagationByResource;
-import org.apache.syncope.common.lib.types.ResourceOperation;
 import org.apache.syncope.core.persistence.api.entity.Any;
 import org.apache.syncope.core.persistence.api.entity.AnyUtils;
 import org.apache.syncope.core.persistence.api.entity.group.Group;
-import org.apache.syncope.core.persistence.api.entity.resource.MappingItem;
-import org.apache.syncope.core.provisioning.api.TimeoutException;
+import org.apache.syncope.core.provisioning.api.WorkflowResult;
 import org.apache.syncope.core.provisioning.api.sync.GroupPushResultHandler;
-import org.identityconnectors.framework.common.objects.ConnectorObject;
-import org.identityconnectors.framework.common.objects.ObjectClass;
-import org.identityconnectors.framework.common.objects.Uid;
 
 public class GroupPushResultHandlerImpl extends AbstractPushResultHandler 
implements GroupPushResultHandler {
 
@@ -47,92 +36,11 @@ public class GroupPushResultHandlerImpl extends 
AbstractPushResultHandler implem
     }
 
     @Override
-    protected Any<?, ?, ?> deprovision(final Any<?, ?, ?> sbj) {
-        GroupTO before = groupDataBinder.getGroupTO(Group.class.cast(sbj), 
true);
-
-        List<String> noPropResources = new ArrayList<>(before.getResources());
-        noPropResources.remove(profile.getTask().getResource().getKey());
-
-        
taskExecutor.execute(propagationManager.getGroupDeleteTasks(before.getKey(), 
noPropResources));
-
-        return groupDAO.authFind(before.getKey());
-    }
-
-    @Override
-    protected Any<?, ?, ?> provision(final Any<?, ?, ?> sbj, final Boolean 
enabled) {
-        GroupTO before = groupDataBinder.getGroupTO(Group.class.cast(sbj), 
true);
-
-        List<String> noPropResources = new ArrayList<>(before.getResources());
-        noPropResources.remove(profile.getTask().getResource().getKey());
-
-        PropagationByResource propByRes = new PropagationByResource();
-        propByRes.add(ResourceOperation.CREATE, 
profile.getTask().getResource().getKey());
-
-        taskExecutor.execute(propagationManager.getGroupCreateTasks(
-                before.getKey(),
-                Collections.unmodifiableCollection(before.getVirAttrs()),
-                propByRes,
-                noPropResources));
-
-        return groupDAO.authFind(before.getKey());
-    }
-
-    @Override
-    protected Any<?, ?, ?> link(final Any<?, ?, ?> sbj, final Boolean unlink) {
-        GroupPatch groupPatch = new GroupPatch();
-        groupPatch.setKey(sbj.getKey());
-
-        groupPatch.getResources().add(new StringPatchItem.Builder().
-                operation(unlink ? PatchOperation.DELETE : 
PatchOperation.ADD_REPLACE).
-                value(profile.getTask().getResource().getKey()).build());
-
-        gwfAdapter.update(groupPatch);
-
-        return groupDAO.authFind(sbj.getKey());
-    }
-
-    @Override
-    protected Any<?, ?, ?> unassign(final Any<?, ?, ?> sbj) {
-        GroupPatch groupPatch = new GroupPatch();
-        groupPatch.setKey(sbj.getKey());
-        groupPatch.getResources().add(new StringPatchItem.Builder().
-                operation(PatchOperation.DELETE).
-                value(profile.getTask().getResource().getKey()).build());
-
-        gwfAdapter.update(groupPatch);
-
-        return deprovision(sbj);
-    }
-
-    @Override
-    protected Any<?, ?, ?> assign(final Any<?, ?, ?> sbj, final Boolean 
enabled) {
-        GroupPatch groupPatch = new GroupPatch();
-        groupPatch.setKey(sbj.getKey());
-        groupPatch.getResources().add(new StringPatchItem.Builder().
-                operation(PatchOperation.ADD_REPLACE).
-                value(profile.getTask().getResource().getKey()).build());
-
-        gwfAdapter.update(groupPatch);
-
-        return provision(sbj, enabled);
-    }
-
-    @Override
     protected String getName(final Any<?, ?, ?> any) {
         return Group.class.cast(any).getName();
     }
 
     @Override
-    protected AnyTO getAnyTO(final long key) {
-        try {
-            return groupDataBinder.getGroupTO(key);
-        } catch (Exception e) {
-            LOG.warn("Error retrieving user {}", key, e);
-            return null;
-        }
-    }
-
-    @Override
     protected Any<?, ?, ?> getAny(final long key) {
         try {
             return groupDAO.authFind(key);
@@ -143,22 +51,20 @@ public class GroupPushResultHandlerImpl extends 
AbstractPushResultHandler implem
     }
 
     @Override
-    protected ConnectorObject getRemoteObject(final String connObjectKey, 
final ObjectClass objectClass) {
-        ConnectorObject obj = null;
-        try {
-            Uid uid = new Uid(connObjectKey);
+    protected AnyTO getAnyTO(final long key) {
+        return groupDataBinder.getGroupTO(key);
+    }
 
-            obj = profile.getConnector().getObject(
-                    objectClass,
-                    uid,
-                    
profile.getConnector().getOperationOptions(Collections.<MappingItem>emptySet()));
-        } catch (TimeoutException toe) {
-            LOG.debug("Request timeout", toe);
-            throw toe;
-        } catch (RuntimeException ignore) {
-            LOG.debug("While resolving {}", connObjectKey, ignore);
-        }
+    @Override
+    protected AnyPatch newPatch(final long key) {
+        GroupPatch patch = new GroupPatch();
+        patch.setKey(key);
+        return patch;
+    }
 
-        return obj;
+    @Override
+    protected WorkflowResult<Long> update(final AnyPatch patch) {
+        return gwfAdapter.update((GroupPatch) patch);
     }
+
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/GroupSyncResultHandlerImpl.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/GroupSyncResultHandlerImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/GroupSyncResultHandlerImpl.java
index 8c11184..2d803b2 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/GroupSyncResultHandlerImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/GroupSyncResultHandlerImpl.java
@@ -25,13 +25,15 @@ import java.util.Map;
 import org.apache.syncope.common.lib.patch.AnyPatch;
 import org.apache.syncope.common.lib.patch.AttrPatch;
 import org.apache.syncope.common.lib.patch.GroupPatch;
-import org.apache.syncope.common.lib.patch.StringPatchItem;
 import org.apache.syncope.common.lib.to.AnyTO;
 import org.apache.syncope.common.lib.to.PropagationStatus;
 import org.apache.syncope.common.lib.to.GroupTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.syncope.common.lib.types.PatchOperation;
+import org.apache.syncope.core.persistence.api.entity.Any;
 import org.apache.syncope.core.persistence.api.entity.AnyUtils;
+import org.apache.syncope.core.provisioning.api.ProvisioningManager;
+import org.apache.syncope.core.provisioning.api.WorkflowResult;
 import org.apache.syncope.core.provisioning.api.sync.ProvisioningResult;
 import org.apache.syncope.core.provisioning.api.sync.GroupSyncResultHandler;
 import org.identityconnectors.framework.common.objects.SyncDelta;
@@ -56,9 +58,14 @@ public class GroupSyncResultHandlerImpl extends 
AbstractSyncResultHandler implem
     }
 
     @Override
-    protected AnyTO getAnyTO(final long key) {
+    protected ProvisioningManager<?, ?> getProvisioningManager() {
+        return groupProvisioningManager;
+    }
+
+    @Override
+    protected Any<?, ?, ?> getAny(final long key) {
         try {
-            return groupDataBinder.getGroupTO(key);
+            return groupDAO.authFind(key);
         } catch (Exception e) {
             LOG.warn("Error retrieving group {}", key, e);
             return null;
@@ -66,30 +73,33 @@ public class GroupSyncResultHandlerImpl extends 
AbstractSyncResultHandler implem
     }
 
     @Override
-    protected AnyTO doCreate(final AnyTO anyTO, final SyncDelta delta, final 
ProvisioningResult result) {
-        GroupTO groupTO = GroupTO.class.cast(anyTO);
-
-        Map.Entry<Long, List<PropagationStatus>> created = 
groupProvisioningManager.create(groupTO, groupOwnerMap,
-                
Collections.singleton(profile.getTask().getResource().getKey()));
+    protected AnyTO getAnyTO(final long key) {
+        return groupDataBinder.getGroupTO(key);
+    }
 
-        result.setKey(created.getKey());
+    @Override
+    protected AnyPatch newPatch(final long key) {
+        GroupPatch patch = new GroupPatch();
+        patch.setKey(key);
+        return patch;
+    }
 
-        return groupDataBinder.getGroupTO(created.getKey());
+    @Override
+    protected WorkflowResult<Long> update(final AnyPatch patch) {
+        return gwfAdapter.update((GroupPatch) patch);
     }
 
     @Override
-    protected AnyTO doLink(
-            final AnyTO before,
-            final ProvisioningResult result,
-            final boolean unlink) {
+    protected AnyTO doCreate(final AnyTO anyTO, final SyncDelta delta, final 
ProvisioningResult result) {
+        GroupTO groupTO = GroupTO.class.cast(anyTO);
 
-        GroupPatch groupPatch = new GroupPatch();
-        groupPatch.setKey(before.getKey());
-        groupPatch.getResources().add(new StringPatchItem.Builder().
-                operation(unlink ? PatchOperation.DELETE : 
PatchOperation.ADD_REPLACE).
-                value(profile.getTask().getResource().getKey()).build());
+        Map.Entry<Long, List<PropagationStatus>> created = 
groupProvisioningManager.create(
+                groupTO, groupOwnerMap, 
Collections.singleton(profile.getTask().getResource().getKey()));
+
+        result.setKey(created.getKey());
+        result.setName(getName(anyTO));
 
-        return 
groupDataBinder.getGroupTO(gwfAdapter.update(groupPatch).getResult());
+        return getAnyTO(created.getKey());
     }
 
     @Override
@@ -103,7 +113,6 @@ public class GroupSyncResultHandlerImpl extends 
AbstractSyncResultHandler implem
 
         Map.Entry<Long, List<PropagationStatus>> updated = 
groupProvisioningManager.update(groupPatch);
 
-        // moved after group provisioning manager
         String groupOwner = null;
         for (AttrPatch attrPatch : groupPatch.getPlainAttrs()) {
             if (attrPatch.getOperation() == PatchOperation.ADD_REPLACE && 
attrPatch.getAttrTO() != null
@@ -123,29 +132,4 @@ public class GroupSyncResultHandlerImpl extends 
AbstractSyncResultHandler implem
         return after;
     }
 
-    @Override
-    protected void doDeprovision(final Long key, final boolean unlink) {
-        taskExecutor.execute(propagationManager.getGroupDeleteTasks(key, 
profile.getTask().getResource().getKey()));
-
-        if (unlink) {
-            GroupPatch groupPatch = new GroupPatch();
-            groupPatch.setKey(key);
-            groupPatch.getResources().add(new StringPatchItem.Builder().
-                    operation(PatchOperation.DELETE).
-                    value(profile.getTask().getResource().getKey()).build());
-        }
-    }
-
-    @Override
-    protected void doDelete(final Long key) {
-        try {
-            taskExecutor.execute(propagationManager.getGroupDeleteTasks(key, 
profile.getTask().getResource().getKey()));
-        } catch (Exception e) {
-            // A propagation failure doesn't imply a synchronization failure.
-            // The propagation exception status will be reported into the 
propagation task execution.
-            LOG.error("Could not propagate group " + key, e);
-        }
-
-        groupProvisioningManager.delete(key);
-    }
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserPushResultHandlerImpl.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserPushResultHandlerImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserPushResultHandlerImpl.java
index 12d1eb6..5829216 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserPushResultHandlerImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserPushResultHandlerImpl.java
@@ -19,25 +19,19 @@
 package org.apache.syncope.core.provisioning.java.sync;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import org.apache.syncope.common.lib.patch.StringPatchItem;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.syncope.common.lib.patch.AnyPatch;
 import org.apache.syncope.common.lib.patch.UserPatch;
 import org.apache.syncope.common.lib.to.AnyTO;
-import org.apache.syncope.common.lib.to.UserTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.common.lib.types.PatchOperation;
 import org.apache.syncope.common.lib.types.PropagationByResource;
 import org.apache.syncope.common.lib.types.ResourceOperation;
 import org.apache.syncope.core.persistence.api.entity.Any;
 import org.apache.syncope.core.persistence.api.entity.AnyUtils;
-import org.apache.syncope.core.persistence.api.entity.resource.MappingItem;
 import org.apache.syncope.core.persistence.api.entity.user.User;
-import org.apache.syncope.core.provisioning.api.TimeoutException;
+import org.apache.syncope.core.provisioning.api.WorkflowResult;
 import org.apache.syncope.core.provisioning.api.sync.UserPushResultHandler;
-import org.identityconnectors.framework.common.objects.ConnectorObject;
-import org.identityconnectors.framework.common.objects.ObjectClass;
-import org.identityconnectors.framework.common.objects.Uid;
 
 public class UserPushResultHandlerImpl extends AbstractPushResultHandler 
implements UserPushResultHandler {
 
@@ -47,21 +41,8 @@ public class UserPushResultHandlerImpl extends 
AbstractPushResultHandler impleme
     }
 
     @Override
-    protected Any<?, ?, ?> deprovision(final Any<?, ?, ?> sbj) {
-        UserTO before = userDataBinder.getUserTO(sbj.getKey());
-
-        List<String> noPropResources = new ArrayList<>(before.getResources());
-        noPropResources.remove(profile.getTask().getResource().getKey());
-
-        
taskExecutor.execute(propagationManager.getUserDeleteTasks(before.getKey(),
-                
Collections.singleton(profile.getTask().getResource().getKey()), 
noPropResources));
-
-        return userDAO.authFind(before.getKey());
-    }
-
-    @Override
-    protected Any<?, ?, ?> provision(final Any<?, ?, ?> sbj, final Boolean 
enabled) {
-        UserTO before = userDataBinder.getUserTO(sbj.getKey());
+    protected void provision(final Any<?, ?, ?> any, final Boolean enabled) {
+        AnyTO before = getAnyTO(any.getKey());
 
         List<String> noPropResources = new ArrayList<>(before.getResources());
         noPropResources.remove(profile.getTask().getResource().getKey());
@@ -71,51 +52,11 @@ public class UserPushResultHandlerImpl extends 
AbstractPushResultHandler impleme
 
         taskExecutor.execute(propagationManager.getUserCreateTasks(
                 before.getKey(),
+                null,
                 enabled,
                 propByRes,
-                null,
-                Collections.unmodifiableCollection(before.getVirAttrs()),
+                before.getVirAttrs(),
                 noPropResources));
-
-        return userDAO.authFind(before.getKey());
-    }
-
-    @Override
-    protected Any<?, ?, ?> link(final Any<?, ?, ?> sbj, final Boolean unlink) {
-        UserPatch userPatch = new UserPatch();
-        userPatch.setKey(sbj.getKey());
-        userPatch.getResources().add(new StringPatchItem.Builder().
-                operation(unlink ? PatchOperation.DELETE : 
PatchOperation.ADD_REPLACE).
-                value(profile.getTask().getResource().getKey()).build());
-
-        uwfAdapter.update(userPatch);
-
-        return userDAO.authFind(userPatch.getKey());
-    }
-
-    @Override
-    protected Any<?, ?, ?> unassign(final Any<?, ?, ?> sbj) {
-        UserPatch userPatch = new UserPatch();
-        userPatch.setKey(sbj.getKey());
-        userPatch.getResources().add(new StringPatchItem.Builder().
-                operation(PatchOperation.DELETE).
-                value(profile.getTask().getResource().getKey()).build());
-
-        uwfAdapter.update(userPatch);
-
-        return deprovision(sbj);
-    }
-
-    @Override
-    protected Any<?, ?, ?> assign(final Any<?, ?, ?> sbj, final Boolean 
enabled) {
-        UserPatch userPatch = new UserPatch();
-        userPatch.setKey(sbj.getKey());
-        userPatch.getResources().add(new StringPatchItem.Builder().
-                operation(PatchOperation.ADD_REPLACE).
-                value(profile.getTask().getResource().getKey()).build());
-        uwfAdapter.update(userPatch);
-
-        return provision(sbj, enabled);
     }
 
     @Override
@@ -124,16 +65,6 @@ public class UserPushResultHandlerImpl extends 
AbstractPushResultHandler impleme
     }
 
     @Override
-    protected AnyTO getAnyTO(final long key) {
-        try {
-            return userDataBinder.getUserTO(key);
-        } catch (Exception e) {
-            LOG.warn("Error retrieving user {}", key, e);
-            return null;
-        }
-    }
-
-    @Override
     protected Any<?, ?, ?> getAny(final long key) {
         try {
             return userDAO.authFind(key);
@@ -144,23 +75,22 @@ public class UserPushResultHandlerImpl extends 
AbstractPushResultHandler impleme
     }
 
     @Override
-    protected ConnectorObject getRemoteObject(final String connObjectKey, 
final ObjectClass objectClass) {
-        ConnectorObject obj = null;
-        try {
-            Uid uid = new Uid(connObjectKey);
-
-            obj = profile.getConnector().getObject(
-                    objectClass,
-                    uid,
-                    
profile.getConnector().getOperationOptions(Collections.<MappingItem>emptySet()));
+    protected AnyTO getAnyTO(final long key) {
+        return userDataBinder.getUserTO(key);
+    }
 
-        } catch (TimeoutException toe) {
-            LOG.debug("Request timeout", toe);
-            throw toe;
-        } catch (RuntimeException ignore) {
-            LOG.debug("While resolving {}", connObjectKey, ignore);
-        }
+    @Override
+    protected AnyPatch newPatch(final long key) {
+        UserPatch patch = new UserPatch();
+        patch.setKey(key);
+        return patch;
+    }
 
-        return obj;
+    @Override
+    protected WorkflowResult<Long> update(final AnyPatch patch) {
+        WorkflowResult<Pair<UserPatch, Boolean>> update = 
uwfAdapter.update((UserPatch) patch);
+        return new WorkflowResult<>(
+                update.getResult().getLeft().getKey(), update.getPropByRes(), 
update.getPerformedTasks());
     }
+
 }

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserSyncResultHandlerImpl.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserSyncResultHandlerImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserSyncResultHandlerImpl.java
index 5205c0d..c5e918a 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserSyncResultHandlerImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/UserSyncResultHandlerImpl.java
@@ -21,15 +21,17 @@ package org.apache.syncope.core.provisioning.java.sync;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.syncope.common.lib.patch.AnyPatch;
-import org.apache.syncope.common.lib.patch.StringPatchItem;
 import org.apache.syncope.common.lib.patch.UserPatch;
 import org.apache.syncope.common.lib.to.AnyTO;
 import org.apache.syncope.common.lib.to.PropagationStatus;
 import org.apache.syncope.common.lib.to.UserTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.common.lib.types.PatchOperation;
+import org.apache.syncope.core.persistence.api.entity.Any;
 import org.apache.syncope.core.persistence.api.entity.AnyUtils;
+import org.apache.syncope.core.provisioning.api.ProvisioningManager;
+import org.apache.syncope.core.provisioning.api.WorkflowResult;
 import org.apache.syncope.core.provisioning.api.sync.ProvisioningResult;
 import org.apache.syncope.core.provisioning.api.sync.UserSyncResultHandler;
 import org.identityconnectors.framework.common.objects.SyncDelta;
@@ -47,9 +49,14 @@ public class UserSyncResultHandlerImpl extends 
AbstractSyncResultHandler impleme
     }
 
     @Override
-    protected AnyTO getAnyTO(final long key) {
+    protected ProvisioningManager<?, ?> getProvisioningManager() {
+        return userProvisioningManager;
+    }
+
+    @Override
+    protected Any<?, ?, ?> getAny(final long key) {
         try {
-            return userDataBinder.getUserTO(key);
+            return userDAO.authFind(key);
         } catch (Exception e) {
             LOG.warn("Error retrieving user {}", key, e);
             return null;
@@ -57,6 +64,25 @@ public class UserSyncResultHandlerImpl extends 
AbstractSyncResultHandler impleme
     }
 
     @Override
+    protected AnyTO getAnyTO(final long key) {
+        return userDataBinder.getUserTO(key);
+    }
+
+    @Override
+    protected AnyPatch newPatch(final long key) {
+        UserPatch patch = new UserPatch();
+        patch.setKey(key);
+        return patch;
+    }
+
+    @Override
+    protected WorkflowResult<Long> update(final AnyPatch patch) {
+        WorkflowResult<Pair<UserPatch, Boolean>> update = 
uwfAdapter.update((UserPatch) patch);
+        return new WorkflowResult<>(
+                update.getResult().getLeft().getKey(), update.getPropByRes(), 
update.getPerformedTasks());
+    }
+
+    @Override
     protected AnyTO doCreate(final AnyTO anyTO, final SyncDelta delta, final 
ProvisioningResult result) {
         UserTO userTO = UserTO.class.cast(anyTO);
 
@@ -66,23 +92,9 @@ public class UserSyncResultHandlerImpl extends 
AbstractSyncResultHandler impleme
                         
Collections.singleton(profile.getTask().getResource().getKey()));
 
         result.setKey(created.getKey());
+        result.setName(getName(anyTO));
 
-        return userDataBinder.getUserTO(created.getKey());
-    }
-
-    @Override
-    protected AnyTO doLink(
-            final AnyTO before,
-            final ProvisioningResult result,
-            final boolean unlink) {
-
-        UserPatch userPatch = new UserPatch();
-        userPatch.setKey(before.getKey());
-        userPatch.getResources().add(new StringPatchItem.Builder().
-                operation(unlink ? PatchOperation.DELETE : 
PatchOperation.ADD_REPLACE).
-                value(profile.getTask().getResource().getKey()).build());
-
-        return 
userDataBinder.getUserTO(uwfAdapter.update(userPatch).getResult().getKey().getKey());
+        return getAnyTO(created.getKey());
     }
 
     @Override
@@ -95,31 +107,17 @@ public class UserSyncResultHandlerImpl extends 
AbstractSyncResultHandler impleme
         UserPatch userPatch = UserPatch.class.cast(anyPatch);
         Boolean enabled = syncUtilities.readEnabled(delta.getObject(), 
profile.getTask());
 
-        Map.Entry<Long, List<PropagationStatus>> updated = 
userProvisioningManager.update(userPatch, before.getKey(),
-                result, enabled, 
Collections.singleton(profile.getTask().getResource().getKey()));
-
-        return userDataBinder.getUserTO(updated.getKey());
-    }
+        Map.Entry<Long, List<PropagationStatus>> updated = 
userProvisioningManager.update(
+                userPatch, before.getKey(),
+                result,
+                enabled,
+                
Collections.singleton(profile.getTask().getResource().getKey()));
 
-    @Override
-    protected void doDeprovision(
-            final Long key,
-            final boolean unlink) {
-
-        taskExecutor.execute(propagationManager.getUserDeleteTasks(
-                key, 
Collections.singleton(profile.getTask().getResource().getKey())));
-
-        if (unlink) {
-            UserPatch userPatch = new UserPatch();
-            userPatch.setKey(key);
-            userPatch.getResources().add(new StringPatchItem.Builder().
-                    operation(PatchOperation.DELETE).
-                    value(profile.getTask().getResource().getKey()).build());
-        }
+        return getAnyTO(updated.getKey());
     }
 
     @Override
-    protected void doDelete(final Long key) {
+    protected void doDelete(final AnyTypeKind kind, final Long key) {
         try {
             userProvisioningManager.
                     delete(key, 
Collections.<String>singleton(profile.getTask().getResource().getKey()));

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectCreateProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectCreateProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectCreateProcessor.java
index 6316230..1013d07 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectCreateProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectCreateProcessor.java
@@ -24,6 +24,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.syncope.common.lib.to.AnyObjectTO;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.syncope.core.misc.spring.ApplicationContextProvider;
 import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
 import org.apache.syncope.core.provisioning.api.WorkflowResult;
@@ -52,10 +53,14 @@ public class AnyObjectCreateProcessor implements Processor {
     public void process(final Exchange exchange) {
         WorkflowResult<Long> created = (WorkflowResult) 
exchange.getIn().getBody();
         AnyObjectTO any = exchange.getProperty("any", AnyObjectTO.class);
-        Set<String> excludedResource = 
exchange.getProperty("excludedResources", Set.class);
+        Set<String> excludedResources = 
exchange.getProperty("excludedResources", Set.class);
 
-        List<PropagationTask> tasks =
-                propagationManager.getAnyObjectCreateTasks(created, 
any.getVirAttrs(), excludedResource);
+        List<PropagationTask> tasks = propagationManager.getCreateTasks(
+                AnyTypeKind.ANY_OBJECT,
+                created.getResult(),
+                created.getPropByRes(),
+                any.getVirAttrs(),
+                excludedResources);
         PropagationReporter propagationReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
         try {

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeleteProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeleteProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeleteProcessor.java
index 5045ab7..7826053 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeleteProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeleteProcessor.java
@@ -18,14 +18,12 @@
  */
 package org.apache.syncope.core.provisioning.camel.processor;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.syncope.core.misc.spring.ApplicationContextProvider;
-import org.apache.syncope.core.persistence.api.dao.AnyObjectDAO;
-import org.apache.syncope.core.persistence.api.entity.anyobject.AnyObject;
 import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationException;
 import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
@@ -51,23 +49,17 @@ public class AnyObjectDeleteProcessor implements Processor {
     @Autowired
     protected PropagationTaskExecutor taskExecutor;
 
-    @Autowired
-    protected AnyObjectDAO anyObjectDAO;
-
     @Override
     public void process(final Exchange exchange) throws Exception {
-        Long anyKey = exchange.getIn().getBody(Long.class);
-        AnyObject anyObject = anyObjectDAO.find(anyKey);
+        Long key = exchange.getIn().getBody(Long.class);
         @SuppressWarnings("unchecked")
         Set<String> excludedResources = 
exchange.getProperty("excludedResources", Set.class);
 
-        List<PropagationTask> tasks = new ArrayList<>();
-
-        if (anyObject != null) {
-            // Generate propagation tasks for deleting this anyObject from 
resources
-            
tasks.addAll(propagationManager.getAnyObjectDeleteTasks(anyObject.getKey(), 
excludedResources));
-        }
-
+        List<PropagationTask> tasks = propagationManager.getDeleteTasks(
+                AnyTypeKind.ANY_OBJECT,
+                key,
+                null,
+                excludedResources);
         PropagationReporter propagationReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
         try {

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeprovisionProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeprovisionProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeprovisionProcessor.java
index 5836a9f..f08b578 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeprovisionProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeprovisionProcessor.java
@@ -18,15 +18,15 @@
  */
 package org.apache.syncope.core.provisioning.camel.processor;
 
-import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
+import org.apache.syncope.common.lib.types.PropagationByResource;
+import org.apache.syncope.common.lib.types.ResourceOperation;
 import org.apache.syncope.core.misc.spring.ApplicationContextProvider;
 import org.apache.syncope.core.persistence.api.dao.AnyObjectDAO;
-import org.apache.syncope.core.persistence.api.entity.anyobject.AnyObject;
 import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationException;
 import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
@@ -54,15 +54,17 @@ public class AnyObjectDeprovisionProcessor implements 
Processor {
     @SuppressWarnings("unchecked")
     @Override
     public void process(final Exchange exchange) {
-        Long anyObjectKey = exchange.getIn().getBody(Long.class);
+        Long key = exchange.getIn().getBody(Long.class);
         List<String> resources = exchange.getProperty("resources", List.class);
 
-        AnyObject anyObject = anyObjectDAO.authFind(anyObjectKey);
+        PropagationByResource propByRes = new PropagationByResource();
+        propByRes.addAll(ResourceOperation.DELETE, resources);
 
-        Collection<String> noPropResourceNames = 
CollectionUtils.removeAll(anyObject.getResourceNames(), resources);
-
-        List<PropagationTask> tasks =
-                propagationManager.getAnyObjectDeleteTasks(anyObjectKey, new 
HashSet<>(resources), noPropResourceNames);
+        List<PropagationTask> tasks = propagationManager.getDeleteTasks(
+                AnyTypeKind.ANY_OBJECT,
+                key,
+                propByRes,
+                
CollectionUtils.removeAll(anyObjectDAO.findAllResourceNames(anyObjectDAO.authFind(key)),
 resources));
         PropagationReporter propagationReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
         try {

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectProvisionProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectProvisionProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectProvisionProcessor.java
index 1c1f24d..8170d34 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectProvisionProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectProvisionProcessor.java
@@ -21,12 +21,11 @@ package 
org.apache.syncope.core.provisioning.camel.processor;
 import java.util.List;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.syncope.common.lib.types.PropagationByResource;
 import org.apache.syncope.common.lib.types.ResourceOperation;
 import org.apache.syncope.core.misc.spring.ApplicationContextProvider;
-import org.apache.syncope.core.persistence.api.dao.AnyObjectDAO;
 import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
-import org.apache.syncope.core.provisioning.api.WorkflowResult;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationException;
 import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
@@ -47,9 +46,6 @@ public class AnyObjectProvisionProcessor implements Processor 
{
     @Autowired
     protected PropagationTaskExecutor taskExecutor;
 
-    @Autowired
-    protected AnyObjectDAO anyObjectDAO;
-
     @SuppressWarnings("unchecked")
     @Override
     public void process(final Exchange exchange) {
@@ -59,9 +55,14 @@ public class AnyObjectProvisionProcessor implements 
Processor {
         PropagationByResource propByRes = new PropagationByResource();
         propByRes.addAll(ResourceOperation.UPDATE, resources);
 
-        WorkflowResult<Long> wfResult = new WorkflowResult<>(key, propByRes, 
"update");
-
-        List<PropagationTask> tasks = 
propagationManager.getAnyObjectUpdateTasks(wfResult, null, null);
+        List<PropagationTask> tasks = propagationManager.getUpdateTasks(
+                AnyTypeKind.ANY_OBJECT,
+                key,
+                false,
+                null,
+                propByRes,
+                null,
+                null);
         PropagationReporter propagationReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
         try {

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectUpdateProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectUpdateProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectUpdateProcessor.java
index 7243f8c..978388d 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectUpdateProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectUpdateProcessor.java
@@ -61,16 +61,29 @@ public class AnyObjectUpdateProcessor implements Processor {
         AnyObjectPatch anyObjectPatch = exchange.getProperty("anyPatch", 
AnyObjectPatch.class);
         Set<String> excludedResources = 
exchange.getProperty("excludedResources", Set.class);
 
-        List<PropagationTask> tasks = 
propagationManager.getAnyObjectUpdateTasks(
-                updated, anyObjectPatch.getVirAttrs(), excludedResources);
+        List<PropagationTask> tasks = propagationManager.getUpdateTasks(
+                AnyTypeKind.ANY_OBJECT,
+                updated.getResult(),
+                false,
+                null,
+                updated.getPropByRes(),
+                anyObjectPatch.getVirAttrs(),
+                excludedResources);
         if (tasks.isEmpty()) {
             // SYNCOPE-459: take care of user virtual attributes ...
-            PropagationByResource propByResVirAttr = 
virtAttrHandler.fillVirtual(
+            PropagationByResource propByResVirAttr = 
virtAttrHandler.updateVirtual(
                     updated.getResult(),
                     AnyTypeKind.ANY_OBJECT,
                     anyObjectPatch.getVirAttrs());
             tasks.addAll(!propByResVirAttr.isEmpty()
-                    ? propagationManager.getAnyObjectUpdateTasks(updated, 
null, null)
+                    ? propagationManager.getUpdateTasks(
+                            AnyTypeKind.ANY_OBJECT,
+                            updated.getResult(),
+                            false,
+                            null,
+                            updated.getPropByRes(),
+                            anyObjectPatch.getVirAttrs(),
+                            null)
                     : Collections.<PropagationTask>emptyList());
         }
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInSyncProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInSyncProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInSyncProcessor.java
index 8dc8bde..474a3f2 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInSyncProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInSyncProcessor.java
@@ -28,15 +28,23 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.syncope.common.lib.to.AttrTO;
 import org.apache.syncope.common.lib.to.GroupTO;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
+import org.apache.syncope.core.misc.spring.ApplicationContextProvider;
 import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
 import org.apache.syncope.core.provisioning.api.WorkflowResult;
+import 
org.apache.syncope.core.provisioning.api.propagation.PropagationException;
 import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
+import 
org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 @Component
 public class GroupCreateInSyncProcessor implements Processor {
 
+    private static final Logger LOG = 
LoggerFactory.getLogger(GroupCreateInSyncProcessor.class);
+
     @Autowired
     protected PropagationManager propagationManager;
 
@@ -48,19 +56,29 @@ public class GroupCreateInSyncProcessor implements 
Processor {
     public void process(final Exchange exchange) {
         WorkflowResult<Long> created = (WorkflowResult) 
exchange.getIn().getBody();
 
-        GroupTO actual = exchange.getProperty("any", GroupTO.class);
+        GroupTO groupTO = exchange.getProperty("any", GroupTO.class);
         Map<Long, String> groupOwnerMap = 
exchange.getProperty("groupOwnerMap", Map.class);
         Set<String> excludedResources = 
exchange.getProperty("excludedResources", Set.class);
 
-        AttrTO groupOwner = actual.getPlainAttrMap().get(StringUtils.EMPTY);
+        AttrTO groupOwner = groupTO.getPlainAttrMap().get(StringUtils.EMPTY);
         if (groupOwner != null) {
             groupOwnerMap.put(created.getResult(), 
groupOwner.getValues().iterator().next());
         }
 
-        List<PropagationTask> tasks = propagationManager.getGroupCreateTasks(
-                created, actual.getVirAttrs(), excludedResources);
-
-        taskExecutor.execute(tasks);
+        List<PropagationTask> tasks = propagationManager.getCreateTasks(
+                AnyTypeKind.GROUP,
+                created.getResult(),
+                created.getPropByRes(),
+                groupTO.getVirAttrs(),
+                excludedResources);
+        PropagationReporter propagationReporter =
+                
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
+        try {
+            taskExecutor.execute(tasks, propagationReporter);
+        } catch (PropagationException e) {
+            LOG.error("Error propagation primary resource", e);
+            propagationReporter.onPrimaryResourceFailure(tasks);
+        }
 
         exchange.getOut().setBody(new ImmutablePair<>(created.getResult(), 
null));
     }

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java
index 0fb7058..b0bddef 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java
@@ -24,6 +24,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.syncope.common.lib.to.GroupTO;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.syncope.core.misc.spring.ApplicationContextProvider;
 import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
 import org.apache.syncope.core.provisioning.api.WorkflowResult;
@@ -52,10 +53,14 @@ public class GroupCreateProcessor implements Processor {
     public void process(final Exchange exchange) {
         WorkflowResult<Long> created = (WorkflowResult) 
exchange.getIn().getBody();
         GroupTO any = exchange.getProperty("any", GroupTO.class);
-        Set<String> excludedResource = 
exchange.getProperty("excludedResources", Set.class);
+        Set<String> excludedResources = 
exchange.getProperty("excludedResources", Set.class);
 
-        List<PropagationTask> tasks =
-                propagationManager.getGroupCreateTasks(created, 
any.getVirAttrs(), excludedResource);
+        List<PropagationTask> tasks = propagationManager.getCreateTasks(
+                AnyTypeKind.GROUP,
+                created.getResult(),
+                created.getPropByRes(),
+                any.getVirAttrs(),
+                excludedResources);
         PropagationReporter propagationReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
         try {

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java
index 00b71d4..96b328e 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java
@@ -19,18 +19,16 @@
 package org.apache.syncope.core.provisioning.camel.processor;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.syncope.common.lib.types.PropagationByResource;
 import org.apache.syncope.core.misc.spring.ApplicationContextProvider;
 import org.apache.syncope.core.persistence.api.dao.GroupDAO;
-import org.apache.syncope.core.persistence.api.entity.group.Group;
 import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
-import org.apache.syncope.core.provisioning.api.WorkflowResult;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationException;
 import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
@@ -60,35 +58,40 @@ public class GroupDeleteProcessor implements Processor {
 
     @Override
     public void process(final Exchange exchange) throws Exception {
-        Long anyKey = exchange.getIn().getBody(Long.class);
-        Group group = groupDAO.find(anyKey);
+        Long key = exchange.getIn().getBody(Long.class);
         @SuppressWarnings("unchecked")
         Set<String> excludedResources = 
exchange.getProperty("excludedResources", Set.class);
 
         List<PropagationTask> tasks = new ArrayList<>();
 
-        if (group != null) {
-            // Generate propagation tasks for deleting users from group 
resources, if they are on those resources only
-            // because of the reason being deleted (see SYNCOPE-357)
-            for (Map.Entry<Long, PropagationByResource> entry
-                    : 
groupDAO.findUsersWithTransitiveResources(group.getKey()).entrySet()) {
-
-                WorkflowResult<Long> wfResult =
-                        new WorkflowResult<>(entry.getKey(), entry.getValue(), 
Collections.<String>emptySet());
-                
tasks.addAll(propagationManager.getUserDeleteTasks(wfResult.getResult(), 
excludedResources));
-            }
-            for (Map.Entry<Long, PropagationByResource> entry
-                    : 
groupDAO.findAnyObjectsWithTransitiveResources(group.getKey()).entrySet()) {
-
-                WorkflowResult<Long> wfResult =
-                        new WorkflowResult<>(entry.getKey(), entry.getValue(), 
Collections.<String>emptySet());
-                
tasks.addAll(propagationManager.getAnyObjectDeleteTasks(wfResult.getResult(), 
excludedResources));
-            }
-
-            // Generate propagation tasks for deleting this group from 
resources
-            
tasks.addAll(propagationManager.getGroupDeleteTasks(group.getKey(), 
excludedResources));
+        // Generate propagation tasks for deleting users from group resources, 
if they are on those resources only
+        // because of the reason being deleted (see SYNCOPE-357)
+        for (Map.Entry<Long, PropagationByResource> entry
+                : groupDAO.findUsersWithTransitiveResources(key).entrySet()) {
+
+            tasks.addAll(propagationManager.getDeleteTasks(
+                    AnyTypeKind.USER,
+                    entry.getKey(),
+                    entry.getValue(),
+                    excludedResources));
+        }
+        for (Map.Entry<Long, PropagationByResource> entry
+                : 
groupDAO.findAnyObjectsWithTransitiveResources(key).entrySet()) {
+
+            tasks.addAll(propagationManager.getDeleteTasks(
+                    AnyTypeKind.ANY_OBJECT,
+                    entry.getKey(),
+                    entry.getValue(),
+                    excludedResources));
         }
 
+        // Generate propagation tasks for deleting this group from resources
+        tasks.addAll(propagationManager.getDeleteTasks(
+                AnyTypeKind.GROUP,
+                key,
+                null,
+                null));
+
         PropagationReporter propagationReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
         try {

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeprovisionProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeprovisionProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeprovisionProcessor.java
index cd36bfb..a5c0875 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeprovisionProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeprovisionProcessor.java
@@ -18,15 +18,15 @@
  */
 package org.apache.syncope.core.provisioning.camel.processor;
 
-import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
+import org.apache.syncope.common.lib.types.PropagationByResource;
+import org.apache.syncope.common.lib.types.ResourceOperation;
 import org.apache.syncope.core.misc.spring.ApplicationContextProvider;
 import org.apache.syncope.core.persistence.api.dao.GroupDAO;
-import org.apache.syncope.core.persistence.api.entity.group.Group;
 import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationException;
 import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
@@ -54,15 +54,17 @@ public class GroupDeprovisionProcessor implements Processor 
{
     @SuppressWarnings("unchecked")
     @Override
     public void process(final Exchange exchange) {
-        Long groupKey = exchange.getIn().getBody(Long.class);
+        Long key = exchange.getIn().getBody(Long.class);
         List<String> resources = exchange.getProperty("resources", List.class);
 
-        Group group = groupDAO.authFind(groupKey);
+        PropagationByResource propByRes = new PropagationByResource();
+        propByRes.addAll(ResourceOperation.DELETE, resources);
 
-        Collection<String> noPropResourceNames = 
CollectionUtils.removeAll(group.getResourceNames(), resources);
-
-        List<PropagationTask> tasks =
-                propagationManager.getGroupDeleteTasks(groupKey, new 
HashSet<>(resources), noPropResourceNames);
+        List<PropagationTask> tasks = propagationManager.getDeleteTasks(
+                AnyTypeKind.GROUP,
+                key,
+                propByRes,
+                
CollectionUtils.removeAll(groupDAO.authFind(key).getResourceNames(), 
resources));
         PropagationReporter propagationReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
         try {

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupProvisionProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupProvisionProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupProvisionProcessor.java
index 4c7af59..b7ecc6f 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupProvisionProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupProvisionProcessor.java
@@ -21,12 +21,11 @@ package 
org.apache.syncope.core.provisioning.camel.processor;
 import java.util.List;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.syncope.common.lib.types.PropagationByResource;
 import org.apache.syncope.common.lib.types.ResourceOperation;
 import org.apache.syncope.core.misc.spring.ApplicationContextProvider;
-import org.apache.syncope.core.persistence.api.dao.GroupDAO;
 import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
-import org.apache.syncope.core.provisioning.api.WorkflowResult;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationException;
 import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
@@ -47,9 +46,6 @@ public class GroupProvisionProcessor implements Processor {
     @Autowired
     protected PropagationTaskExecutor taskExecutor;
 
-    @Autowired
-    protected GroupDAO groupDAO;
-
     @SuppressWarnings("unchecked")
     @Override
     public void process(final Exchange exchange) {
@@ -59,9 +55,14 @@ public class GroupProvisionProcessor implements Processor {
         PropagationByResource propByRes = new PropagationByResource();
         propByRes.addAll(ResourceOperation.UPDATE, resources);
 
-        WorkflowResult<Long> wfResult = new WorkflowResult<>(key, propByRes, 
"update");
-
-        List<PropagationTask> tasks = 
propagationManager.getGroupUpdateTasks(wfResult, null, null);
+        List<PropagationTask> tasks = propagationManager.getUpdateTasks(
+                AnyTypeKind.GROUP,
+                key,
+                false,
+                null,
+                propByRes,
+                null,
+                null);
         PropagationReporter propagationReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
         try {

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java
index 22c5f3d..ad9ed63 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java
@@ -61,16 +61,29 @@ public class GroupUpdateProcessor implements Processor {
         GroupPatch groupPatch = exchange.getProperty("anyPatch", 
GroupPatch.class);
         Set<String> excludedResources = 
exchange.getProperty("excludedResources", Set.class);
 
-        List<PropagationTask> tasks = propagationManager.getGroupUpdateTasks(
-                updated, groupPatch.getVirAttrs(), excludedResources);
+        List<PropagationTask> tasks = propagationManager.getUpdateTasks(
+                AnyTypeKind.GROUP,
+                updated.getResult(),
+                false,
+                null,
+                updated.getPropByRes(),
+                groupPatch.getVirAttrs(),
+                excludedResources);
         if (tasks.isEmpty()) {
             // SYNCOPE-459: take care of user virtual attributes ...
-            PropagationByResource propByResVirAttr = 
virtAttrHandler.fillVirtual(
+            PropagationByResource propByResVirAttr = 
virtAttrHandler.updateVirtual(
                     updated.getResult(),
                     AnyTypeKind.GROUP,
                     groupPatch.getVirAttrs());
             tasks.addAll(!propByResVirAttr.isEmpty()
-                    ? propagationManager.getGroupUpdateTasks(updated, null, 
null)
+                    ? propagationManager.getUpdateTasks(
+                            AnyTypeKind.GROUP,
+                            updated.getResult(),
+                            false,
+                            null,
+                            updated.getPropByRes(),
+                            groupPatch.getVirAttrs(),
+                            excludedResources)
                     : Collections.<PropagationTask>emptyList());
         }
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserCreateProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserCreateProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserCreateProcessor.java
index ea06c9d..1a9dd72 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserCreateProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserCreateProcessor.java
@@ -52,16 +52,15 @@ public class UserCreateProcessor implements Processor {
     @Override
     public void process(final Exchange exchange) {
         if ((exchange.getIn().getBody() instanceof WorkflowResult)) {
-
             WorkflowResult<Pair<Long, Boolean>> created = (WorkflowResult) 
exchange.getIn().getBody();
             UserTO actual = exchange.getProperty("actual", UserTO.class);
             Set<String> excludedResources = 
exchange.getProperty("excludedResources", Set.class);
 
             List<PropagationTask> tasks = 
propagationManager.getUserCreateTasks(
                     created.getResult().getKey(),
+                    actual.getPassword(),
                     created.getResult().getValue(),
                     created.getPropByRes(),
-                    actual.getPassword(),
                     actual.getVirAttrs(),
                     excludedResources);
             PropagationReporter propagationReporter =

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeleteProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeleteProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeleteProcessor.java
index b6218a9..5838e01 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeleteProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeleteProcessor.java
@@ -22,7 +22,11 @@ import java.util.List;
 import java.util.Set;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
+import org.apache.syncope.common.lib.types.PropagationByResource;
+import org.apache.syncope.common.lib.types.ResourceOperation;
 import org.apache.syncope.core.misc.spring.ApplicationContextProvider;
+import org.apache.syncope.core.persistence.api.dao.UserDAO;
 import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationException;
 import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
@@ -39,6 +43,9 @@ public class UserDeleteProcessor implements Processor {
     private static final Logger LOG = 
LoggerFactory.getLogger(UserDeleteProcessor.class);
 
     @Autowired
+    protected UserDAO userDAO;
+
+    @Autowired
     protected PropagationManager propagationManager;
 
     @Autowired
@@ -47,15 +54,22 @@ public class UserDeleteProcessor implements Processor {
     @SuppressWarnings("unchecked")
     @Override
     public void process(final Exchange exchange) throws Exception {
-        Long userKey = (Long) exchange.getIn().getBody();
-        Set<String> excludedResource = 
exchange.getProperty("excludedResources", Set.class);
+        Long key = (Long) exchange.getIn().getBody();
+        Set<String> excludedResources = 
exchange.getProperty("excludedResources", Set.class);
+
+        PropagationByResource propByRes = new PropagationByResource();
+        propByRes.set(ResourceOperation.DELETE, 
userDAO.findAllResourceNames(userDAO.authFind(key)));
 
         // Note here that we can only notify about "delete", not any other
         // task defined in workflow process definition: this because this
         // information could only be available after uwfAdapter.delete(), which
         // will also effectively remove user from db, thus making virtually
         // impossible by NotificationManager to fetch required user information
-        List<PropagationTask> tasks = 
propagationManager.getUserDeleteTasks(userKey, excludedResource);
+        List<PropagationTask> tasks = propagationManager.getDeleteTasks(
+                AnyTypeKind.USER,
+                key,
+                propByRes,
+                excludedResources);
 
         PropagationReporter propagationReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeprovisionProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeprovisionProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeprovisionProcessor.java
index 642870a..522af51 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeprovisionProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeprovisionProcessor.java
@@ -18,15 +18,16 @@
  */
 package org.apache.syncope.core.provisioning.camel.processor;
 
-import java.util.HashSet;
 import java.util.List;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
+import org.apache.syncope.common.lib.types.PropagationByResource;
+import org.apache.syncope.common.lib.types.ResourceOperation;
 import org.apache.syncope.core.misc.spring.ApplicationContextProvider;
 import org.apache.syncope.core.persistence.api.dao.UserDAO;
 import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
-import org.apache.syncope.core.persistence.api.entity.user.User;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationException;
 import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
 import 
org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
@@ -52,16 +53,18 @@ public class UserDeprovisionProcessor implements Processor {
 
     @Override
     public void process(final Exchange exchange) {
-        Long userKey = exchange.getIn().getBody(Long.class);
+        Long key = exchange.getIn().getBody(Long.class);
         @SuppressWarnings("unchecked")
         List<String> resources = exchange.getProperty("resources", List.class);
 
-        User user = userDAO.authFind(userKey);
+        PropagationByResource propByRes = new PropagationByResource();
+        propByRes.set(ResourceOperation.DELETE, resources);
 
-        List<PropagationTask> tasks = propagationManager.getUserDeleteTasks(
-                userKey,
-                new HashSet<>(resources),
-                CollectionUtils.removeAll(userDAO.findAllResourceNames(user), 
resources));
+        List<PropagationTask> tasks = propagationManager.getDeleteTasks(
+                AnyTypeKind.USER,
+                key,
+                propByRes,
+                
CollectionUtils.removeAll(userDAO.findAllResourceNames(userDAO.authFind(key)), 
resources));
         PropagationReporter propagationReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
         try {

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserStatusPropagationProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserStatusPropagationProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserStatusPropagationProcessor.java
index f05a95a..da6e745 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserStatusPropagationProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserStatusPropagationProcessor.java
@@ -25,6 +25,7 @@ import org.apache.camel.Processor;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.syncope.common.lib.patch.StatusPatch;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.syncope.common.lib.types.StatusPatchType;
 import org.apache.syncope.core.misc.spring.ApplicationContextProvider;
 import org.apache.syncope.core.persistence.api.dao.UserDAO;
@@ -61,11 +62,17 @@ public class UserStatusPropagationProcessor implements 
Processor {
         Long key = exchange.getProperty("userKey", Long.class);
         StatusPatch statusPatch = exchange.getProperty("statusPatch", 
StatusPatch.class);
 
-        Collection<String> resourcesToBeExcluded = CollectionUtils.removeAll(
+        Collection<String> noPropResourceNames = CollectionUtils.removeAll(
                 userDAO.findAllResourceNames(userDAO.find(key)), 
statusPatch.getResources());
 
-        List<PropagationTask> tasks = propagationManager.getUserUpdateTasks(
-                key, statusPatch.getType() != StatusPatchType.SUSPEND, 
resourcesToBeExcluded);
+        List<PropagationTask> tasks = propagationManager.getUpdateTasks(
+                AnyTypeKind.USER,
+                statusPatch.getKey(),
+                false,
+                statusPatch.getType() != StatusPatchType.SUSPEND,
+                null,
+                null,
+                noPropResourceNames);
         PropagationReporter propReporter =
                 
ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
         try {

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateProcessor.java
----------------------------------------------------------------------
diff --git 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateProcessor.java
 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateProcessor.java
index 8023264..c50240c 100644
--- 
a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateProcessor.java
+++ 
b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateProcessor.java
@@ -62,7 +62,7 @@ public class UserUpdateProcessor implements Processor {
         List<PropagationTask> tasks = 
propagationManager.getUserUpdateTasks(updated);
         if (tasks.isEmpty()) {
             // SYNCOPE-459: take care of user virtual attributes ...
-            PropagationByResource propByResVirAttr = 
virtAttrHandler.fillVirtual(
+            PropagationByResource propByResVirAttr = 
virtAttrHandler.updateVirtual(
                     updated.getResult().getKey().getKey(),
                     AnyTypeKind.USER,
                     userPatch.getVirAttrs());

http://git-wip-us.apache.org/repos/asf/syncope/blob/3d017e2c/fit/core-reference/src/main/resources/all/provisioning.properties
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/main/resources/all/provisioning.properties 
b/fit/core-reference/src/main/resources/all/provisioning.properties
index 015ca72..336ed21 100644
--- a/fit/core-reference/src/main/resources/all/provisioning.properties
+++ b/fit/core-reference/src/main/resources/all/provisioning.properties
@@ -17,7 +17,7 @@
 camel.directory=${conf.directory}
 
userProvisioningManager=org.apache.syncope.core.provisioning.camel.CamelUserProvisioningManager
 
groupProvisioningManager=org.apache.syncope.core.provisioning.camel.CamelGroupProvisioningManager
-anyObjectProvisioningManager=org.apache.syncope.core.provisioning.java.DefaultAnyObjectProvisioningManager
+anyObjectProvisioningManager=org.apache.syncope.core.provisioning.camel.CamelAnyObjectProvisioningManager
 virAttrCache=org.apache.syncope.core.provisioning.java.cache.MemoryVirAttrCache
 
 quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate

Reply via email to