You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by cs...@apache.org on 2013/01/17 13:13:12 UTC

svn commit: r1434636 - in /syncope/trunk/core/src: main/java/org/apache/syncope/core/connid/ main/java/org/apache/syncope/core/init/ main/java/org/apache/syncope/core/persistence/beans/ main/java/org/apache/syncope/core/persistence/validation/entity/ m...

Author: cschneider
Date: Thu Jan 17 12:13:11 2013
New Revision: 1434636

URL: http://svn.apache.org/viewvc?rev=1434636&view=rev
Log:
SYNCOPE-241 Moving PropagationActions back into core.propagation. Created impl package to avoid cycles

Added:
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationActions.java
      - copied, changed from r1433968, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/PropagationActions.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/SyncopeConnector.java   (with props)
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/AbstractPropagationTaskExecutor.java
      - copied, changed from r1433968, syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/AbstractPropagationTaskExecutor.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/ConnectorFacadeProxy.java
      - copied, changed from r1433968, syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/ConnectorFacadeProxy.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/DefaultPropagationHandler.java
      - copied, changed from r1433968, syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/DefaultPropagationHandler.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java
      - copied, changed from r1433968, syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/LDAPMembershipPropagationActions.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PriorityPropagationTaskExecutor.java
      - copied, changed from r1433968, syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PriorityPropagationTaskExecutor.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java
      - copied, changed from r1434615, syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java
Removed:
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/PropagationActions.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/AbstractPropagationTaskExecutor.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/ConnectorFacadeProxy.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/DefaultPropagationHandler.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/LDAPMembershipPropagationActions.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PriorityPropagationTaskExecutor.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java
Modified:
    syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ConnInstanceLoader.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceValidator.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/ConnectorFactory.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/DefaultPropagationActions.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/LDAPMembershipSyncActions.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncJob.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHandler.java
    syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/WorkflowUserSuspender.java
    syncope/trunk/core/src/main/resources/syncopeContext.xml
    syncope/trunk/core/src/test/java/org/apache/syncope/core/init/ConnInstanceLoaderTest.java
    syncope/trunk/core/src/test/resources/content.xml

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/ConnObjectUtil.java Thu Jan 17 12:13:11 2013
@@ -47,8 +47,8 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.persistence.dao.PolicyDAO;
 import org.apache.syncope.core.persistence.dao.ResourceDAO;
 import org.apache.syncope.core.persistence.dao.RoleDAO;
-import org.apache.syncope.core.propagation.ConnectorFacadeProxy;
 import org.apache.syncope.core.propagation.ConnectorFactory;
+import org.apache.syncope.core.propagation.SyncopeConnector;
 import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.rest.data.UserDataBinder;
 import org.apache.syncope.core.util.ApplicationContextProvider;
@@ -469,7 +469,7 @@ public class ConnObjectUtil {
                     final OperationOptionsBuilder oob = new OperationOptionsBuilder();
                     oob.setAttributesToGet(extAttrNames);
 
-                    final ConnectorFacadeProxy connector = connInstanceLoader.getConnector(resource);
+                    final SyncopeConnector connector = connInstanceLoader.getConnector(resource);
                     final ConnectorObject connObj =
                             connector.getObject(fromAttributable(owner), new Uid(accountId), oob.build());
                     if (connObj != null) {

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ConnInstanceLoader.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ConnInstanceLoader.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ConnInstanceLoader.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ConnInstanceLoader.java Thu Jan 17 12:13:11 2013
@@ -25,8 +25,9 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.persistence.beans.ExternalResource;
 import org.apache.syncope.core.persistence.dao.ConnectorRegistry;
 import org.apache.syncope.core.persistence.dao.ResourceDAO;
-import org.apache.syncope.core.propagation.ConnectorFacadeProxy;
 import org.apache.syncope.core.propagation.ConnectorFactory;
+import org.apache.syncope.core.propagation.SyncopeConnector;
+import org.apache.syncope.core.propagation.impl.ConnectorFacadeProxy;
 import org.apache.syncope.core.rest.data.ResourceDataBinder;
 import org.apache.syncope.core.util.ApplicationContextProvider;
 import org.apache.syncope.core.util.ConnBundleManager;
@@ -65,7 +66,7 @@ class ConnInstanceLoader implements Conn
      * @see ConnectorFactory#getConnector(org.apache.syncope.core.persistence.beans.ExternalResource)
      */
     @Override
-    public ConnectorFacadeProxy getConnector(final ExternalResource resource)
+    public SyncopeConnector getConnector(final ExternalResource resource)
             throws BeansException, NotFoundException {
 
         // Try to re-create connector bean from underlying resource (useful for managing failover scenarios)
@@ -73,10 +74,10 @@ class ConnInstanceLoader implements Conn
             registerConnector(resource);
         }
 
-        return (ConnectorFacadeProxy) ApplicationContextProvider.getBeanFactory().getBean(getBeanName(resource));
+        return (SyncopeConnector) ApplicationContextProvider.getBeanFactory().getBean(getBeanName(resource));
     }
 
-    public ConnectorFacadeProxy createConnectorBean(final ExternalResource resource)
+    public SyncopeConnector createConnectorBean(final ExternalResource resource)
             throws NotFoundException {
 
         final ConnInstance connInstanceClone = resourceDataBinder.getConnInstance(resource);
@@ -93,7 +94,7 @@ class ConnInstanceLoader implements Conn
      * @throws NotFoundException when not able to fetch all the required data.
      */
     @Override
-    public ConnectorFacadeProxy createConnectorBean(final ConnInstance connInstance,
+    public SyncopeConnector createConnectorBean(final ConnInstance connInstance,
             final Set<ConnConfProperty> configuration)
             throws NotFoundException {
 
@@ -111,7 +112,7 @@ class ConnInstanceLoader implements Conn
     public void registerConnector(final ExternalResource resource)
             throws NotFoundException {
 
-        final ConnectorFacadeProxy connector = createConnectorBean(resource);
+        final SyncopeConnector connector = createConnectorBean(resource);
         LOG.debug("Connector to be registered: {}", connector);
 
         final String beanName = getBeanName(resource);

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ImplementationClassNamesLoader.java Thu Jan 17 12:13:11 2013
@@ -25,9 +25,9 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.syncope.core.persistence.beans.PropagationActions;
 import org.apache.syncope.core.persistence.beans.SyncActions;
 import org.apache.syncope.core.persistence.validation.attrvalue.Validator;
+import org.apache.syncope.core.propagation.PropagationActions;
 import org.apache.syncope.core.report.Reportlet;
 import org.apache.syncope.core.notification.NotificationJob;
 import org.apache.syncope.core.report.ReportJob;

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceValidator.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceValidator.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceValidator.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/ExternalResourceValidator.java Thu Jan 17 12:13:11 2013
@@ -24,7 +24,7 @@ import org.apache.commons.lang.StringUti
 import org.apache.syncope.core.persistence.beans.AbstractMapping;
 import org.apache.syncope.core.persistence.beans.AbstractMappingItem;
 import org.apache.syncope.core.persistence.beans.ExternalResource;
-import org.apache.syncope.core.persistence.beans.PropagationActions;
+import org.apache.syncope.core.propagation.PropagationActions;
 import org.apache.syncope.types.EntityViolationType;
 
 public class ExternalResourceValidator extends AbstractValidator implements

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/ConnectorFactory.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/ConnectorFactory.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/ConnectorFactory.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/ConnectorFactory.java Thu Jan 17 12:13:11 2013
@@ -27,7 +27,7 @@ import org.springframework.beans.BeansEx
 
 public interface ConnectorFactory {
 
-    ConnectorFacadeProxy createConnectorBean(ConnInstance connInstance, Set<ConnConfProperty> configuration)
+    SyncopeConnector createConnectorBean(ConnInstance connInstance, Set<ConnConfProperty> configuration)
             throws NotFoundException;
 
     /**
@@ -38,7 +38,7 @@ public interface ConnectorFactory {
      * @throws BeansException if there is any problem with Spring
      * @throws NotFoundException if the connector is not registered in the context
      */
-    ConnectorFacadeProxy getConnector(ExternalResource resource)
+    SyncopeConnector getConnector(ExternalResource resource)
             throws BeansException, NotFoundException;
 
     void load();

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/DefaultPropagationActions.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/DefaultPropagationActions.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/DefaultPropagationActions.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/DefaultPropagationActions.java Thu Jan 17 12:13:11 2013
@@ -18,7 +18,6 @@
  */
 package org.apache.syncope.core.propagation;
 
-import org.apache.syncope.core.persistence.beans.PropagationActions;
 import org.apache.syncope.core.persistence.beans.PropagationTask;
 import org.apache.syncope.core.persistence.beans.TaskExec;
 import org.identityconnectors.framework.common.objects.ConnectorObject;

Copied: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationActions.java (from r1433968, syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/PropagationActions.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationActions.java?p2=syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationActions.java&p1=syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/PropagationActions.java&r1=1433968&r2=1434636&rev=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/PropagationActions.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationActions.java Thu Jan 17 12:13:11 2013
@@ -16,8 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.persistence.beans;
+package org.apache.syncope.core.propagation;
 
+import org.apache.syncope.core.persistence.beans.PropagationTask;
+import org.apache.syncope.core.persistence.beans.TaskExec;
 import org.identityconnectors.framework.common.objects.ConnectorObject;
 
 public interface PropagationActions {

Added: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/SyncopeConnector.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/SyncopeConnector.java?rev=1434636&view=auto
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/SyncopeConnector.java (added)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/SyncopeConnector.java Thu Jan 17 12:13:11 2013
@@ -0,0 +1,191 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.core.propagation;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.syncope.core.persistence.beans.AbstractMappingItem;
+import org.apache.syncope.core.persistence.beans.ConnInstance;
+import org.apache.syncope.types.PropagationMode;
+import org.apache.syncope.types.ResourceOperation;
+import org.identityconnectors.framework.common.objects.Attribute;
+import org.identityconnectors.framework.common.objects.ConnectorObject;
+import org.identityconnectors.framework.common.objects.ObjectClass;
+import org.identityconnectors.framework.common.objects.OperationOptions;
+import org.identityconnectors.framework.common.objects.SyncResultsHandler;
+import org.identityconnectors.framework.common.objects.SyncToken;
+import org.identityconnectors.framework.common.objects.Uid;
+import org.identityconnectors.framework.common.objects.filter.Filter;
+
+public interface SyncopeConnector {
+
+    /**
+     * Create user on a connector instance.
+     *
+     * @param propagationMode propagation mode
+     * @param objectClass ConnId's object class
+     * @param attrs attributes for creation
+     * @param options ConnId's OperationOptions
+     * @param propagationAttempted if creation is actually performed (based on connector instance's capabilities)
+     * @return Uid for created user
+     */
+    Uid create(PropagationMode propagationMode, ObjectClass objectClass,
+            Set<Attribute> attrs, OperationOptions options,
+            Set<String> propagationAttempted);
+
+    /**
+     * Update user on a connector instance.
+     *
+     * @param propagationMode propagation mode
+     * @param objectClass ConnId's object class
+     * @param uid user to be updated
+     * @param attrs attributes for update
+     * @param options ConnId's OperationOptions
+     * @param propagationAttempted if update is actually performed (based on connector instance's capabilities)
+     * @return Uid for created user
+     */
+    Uid update(PropagationMode propagationMode, ObjectClass objectClass,
+            Uid uid, Set<Attribute> attrs, OperationOptions options,
+            Set<String> propagationAttempted);
+
+    /**
+     * Delete user on a connector instance.
+     *
+     * @param propagationMode propagation mode
+     * @param objectClass ConnId's object class
+     * @param uid user to be deleted
+     * @param options ConnId's OperationOptions
+     * @param propagationAttempted if deletion is actually performed (based on connector instance's capabilities)
+     */
+    void delete(PropagationMode propagationMode, ObjectClass objectClass,
+            Uid uid, OperationOptions options, Set<String> propagationAttempted);
+
+    /**
+     * Sync users from a connector instance.
+     *
+     * @param objectClass ConnId's object class.
+     * @param token to be passed to the underlying connector
+     * @param handler to be used to handle deltas.
+     */
+    void sync(ObjectClass objectClass, SyncToken token,
+            SyncResultsHandler handler, OperationOptions options);
+
+    /**
+     * Read latest sync token from a connector instance.
+     *
+     * @param objectClass ConnId's object class.
+     * @return latest sync token
+     */
+    SyncToken getLatestSyncToken(ObjectClass objectClass);
+
+    /**
+     * Get remote object.
+     *
+     * @param objectClass ConnId's object class
+     * @param uid ConnId's Uid
+     * @param options ConnId's OperationOptions
+     * @return ConnId's connector object for given uid
+     */
+    ConnectorObject getObject(ObjectClass objectClass, Uid uid,
+            OperationOptions options);
+
+    /**
+     * Get remote object used by the propagation manager in order to choose for a create (object doesn't exist) or an
+     * update (object exists).
+     *
+     * @param propagationMode propagation mode
+     * @param operationType resource operation type
+     * @param objectClass ConnId's object class
+     * @param uid ConnId's Uid
+     * @param options ConnId's OperationOptions
+     * @return ConnId's connector object for given uid
+     */
+    ConnectorObject getObject(PropagationMode propagationMode,
+            ResourceOperation operationType, ObjectClass objectClass, Uid uid,
+            OperationOptions options);
+
+    List<ConnectorObject> search(ObjectClass objectClass, Filter filter,
+            OperationOptions options);
+
+    /**
+     * Get remote object used by the propagation manager in order to choose for a create (object doesn't exist) or an
+     * update (object exists).
+     *
+     * @param objectClass ConnId's object class.
+     * @param handler to be used to handle deltas.
+     * @param options ConnId's OperationOptions.
+     */
+    void getAllObjects(ObjectClass objectClass, SyncResultsHandler handler,
+            OperationOptions options);
+
+    /**
+     * Read attribute for a given connector object.
+     *
+     * @param objectClass ConnId's object class
+     * @param uid ConnId's Uid
+     * @param options ConnId's OperationOptions
+     * @param attributeName attribute to read
+     * @return attribute (if present)
+     */
+    Attribute getObjectAttribute(ObjectClass objectClass, Uid uid,
+            OperationOptions options, String attributeName);
+
+    /**
+     *
+     * @param objectClass ConnId's object class
+     * @param uid ConnId's Uid
+     * @param options ConnId's OperationOptions
+     * @return attributes (if present)
+     */
+    Set<Attribute> getObjectAttributes(ObjectClass objectClass, Uid uid,
+            OperationOptions options);
+
+    /**
+     * Return resource schema names.
+     *
+     * @param showall return special attributes (like as __NAME__ or __PASSWORD__) if true
+     * @return a list of schema names
+     */
+    Set<String> getSchema(boolean showall);
+
+    /**
+     * Validate a connector instance.
+     */
+    void validate();
+
+    /**
+     * Check connection to resource.
+     */
+    void test();
+
+    /**
+     * Getter for active connector instance.
+     *
+     * @return active connector instance.
+     */
+    ConnInstance getActiveConnInstance();
+
+    OperationOptions getOperationOptions(
+            Collection<AbstractMappingItem> mapItems);
+
+    String toString();
+
+}
\ No newline at end of file

Propchange: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/SyncopeConnector.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/AbstractPropagationTaskExecutor.java (from r1433968, syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/AbstractPropagationTaskExecutor.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/AbstractPropagationTaskExecutor.java?p2=syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/AbstractPropagationTaskExecutor.java&p1=syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/AbstractPropagationTaskExecutor.java&r1=1433968&r2=1434636&rev=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/AbstractPropagationTaskExecutor.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/AbstractPropagationTaskExecutor.java Thu Jan 17 12:13:11 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.propagation;
+package org.apache.syncope.core.propagation.impl;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -30,10 +30,16 @@ import org.apache.commons.lang.StringUti
 import org.apache.syncope.core.connid.ConnObjectUtil;
 import org.apache.syncope.core.persistence.beans.AbstractAttributable;
 import org.apache.syncope.core.persistence.beans.ExternalResource;
-import org.apache.syncope.core.persistence.beans.PropagationActions;
 import org.apache.syncope.core.persistence.beans.PropagationTask;
 import org.apache.syncope.core.persistence.beans.TaskExec;
 import org.apache.syncope.core.persistence.dao.TaskDAO;
+import org.apache.syncope.core.propagation.ConnectorFactory;
+import org.apache.syncope.core.propagation.DefaultPropagationActions;
+import org.apache.syncope.core.propagation.PropagationActions;
+import org.apache.syncope.core.propagation.PropagationException;
+import org.apache.syncope.core.propagation.PropagationHandler;
+import org.apache.syncope.core.propagation.PropagationTaskExecutor;
+import org.apache.syncope.core.propagation.SyncopeConnector;
 import org.apache.syncope.core.rest.data.RoleDataBinder;
 import org.apache.syncope.core.rest.data.UserDataBinder;
 import org.apache.syncope.core.util.ApplicationContextProvider;
@@ -114,7 +120,7 @@ public abstract class AbstractPropagatio
     }
 
     protected void createOrUpdate(final PropagationTask task, final ConnectorObject beforeObj,
-            final ConnectorFacadeProxy connector, final Set<String> propagationAttempted) {
+            final SyncopeConnector connector, final Set<String> propagationAttempted) {
 
         // set of attributes to be propagated
         final Set<Attribute> attributes = new HashSet<Attribute>(task.getAttributes());
@@ -222,7 +228,7 @@ public abstract class AbstractPropagatio
     }
 
     protected void delete(final PropagationTask task, final ConnectorObject beforeObj,
-            final ConnectorFacadeProxy connector, final Set<String> propagationAttempted) {
+            final SyncopeConnector connector, final Set<String> propagationAttempted) {
 
         if (beforeObj == null) {
             LOG.debug("{} not found on external resource: ignoring delete", task.getAccountId());
@@ -275,7 +281,7 @@ public abstract class AbstractPropagatio
         ConnectorObject beforeObj = null;
         ConnectorObject afterObj = null;
 
-        ConnectorFacadeProxy connector = null;
+        SyncopeConnector connector = null;
         try {
             connector = connLoader.getConnector(task.getResource());
 
@@ -421,7 +427,7 @@ public abstract class AbstractPropagatio
      * @param latest 'FALSE' to retrieve object using old accountId if not null.
      * @return remote connector object.
      */
-    protected ConnectorObject getRemoteObject(final PropagationTask task, final ConnectorFacadeProxy connector,
+    protected ConnectorObject getRemoteObject(final PropagationTask task, final SyncopeConnector connector,
             final boolean latest) {
 
         String accountId = latest || task.getOldAccountId() == null

Copied: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/ConnectorFacadeProxy.java (from r1433968, syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/ConnectorFacadeProxy.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/ConnectorFacadeProxy.java?p2=syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/ConnectorFacadeProxy.java&p1=syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/ConnectorFacadeProxy.java&r1=1433968&r2=1434636&rev=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/ConnectorFacadeProxy.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/ConnectorFacadeProxy.java Thu Jan 17 12:13:11 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.propagation;
+package org.apache.syncope.core.propagation.impl;
 
 import java.io.File;
 import java.net.URI;
@@ -28,6 +28,7 @@ import java.util.Set;
 import org.apache.syncope.core.persistence.beans.AbstractMappingItem;
 import org.apache.syncope.core.persistence.beans.ConnInstance;
 import org.apache.syncope.core.persistence.dao.MissingConfKeyException;
+import org.apache.syncope.core.propagation.SyncopeConnector;
 import org.apache.syncope.core.util.ConnBundleManager;
 import org.apache.syncope.core.util.NotFoundException;
 import org.apache.syncope.types.ConnConfProperty;
@@ -67,7 +68,7 @@ import org.springframework.util.ClassUti
  * Intercept calls to ConnectorFacade's methods and check if the corresponding connector instance has been configured to
  * allow every single operation: if not, simply do nothing.
  */
-public class ConnectorFacadeProxy {
+public class ConnectorFacadeProxy implements SyncopeConnector {
 
     /**
      * Logger.
@@ -161,16 +162,10 @@ public class ConnectorFacadeProxy {
         connector.validate();
     }
 
-    /**
-     * Create user on a connector instance.
-     *
-     * @param propagationMode propagation mode
-     * @param objectClass ConnId's object class
-     * @param attrs attributes for creation
-     * @param options ConnId's OperationOptions
-     * @param propagationAttempted if creation is actually performed (based on connector instance's capabilities)
-     * @return Uid for created user
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#create(org.apache.syncope.types.PropagationMode, org.identityconnectors.framework.common.objects.ObjectClass, java.util.Set, org.identityconnectors.framework.common.objects.OperationOptions, java.util.Set)
      */
+    @Override
     public Uid create(final PropagationMode propagationMode, final ObjectClass objectClass, final Set<Attribute> attrs,
             final OperationOptions options, final Set<String> propagationAttempted) {
 
@@ -191,17 +186,10 @@ public class ConnectorFacadeProxy {
         return result;
     }
 
-    /**
-     * Update user on a connector instance.
-     *
-     * @param propagationMode propagation mode
-     * @param objectClass ConnId's object class
-     * @param uid user to be updated
-     * @param attrs attributes for update
-     * @param options ConnId's OperationOptions
-     * @param propagationAttempted if update is actually performed (based on connector instance's capabilities)
-     * @return Uid for created user
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#update(org.apache.syncope.types.PropagationMode, org.identityconnectors.framework.common.objects.ObjectClass, org.identityconnectors.framework.common.objects.Uid, java.util.Set, org.identityconnectors.framework.common.objects.OperationOptions, java.util.Set)
      */
+    @Override
     public Uid update(final PropagationMode propagationMode, final ObjectClass objectClass, final Uid uid,
             final Set<Attribute> attrs, final OperationOptions options, final Set<String> propagationAttempted) {
 
@@ -223,15 +211,10 @@ public class ConnectorFacadeProxy {
         return result;
     }
 
-    /**
-     * Delete user on a connector instance.
-     *
-     * @param propagationMode propagation mode
-     * @param objectClass ConnId's object class
-     * @param uid user to be deleted
-     * @param options ConnId's OperationOptions
-     * @param propagationAttempted if deletion is actually performed (based on connector instance's capabilities)
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#delete(org.apache.syncope.types.PropagationMode, org.identityconnectors.framework.common.objects.ObjectClass, org.identityconnectors.framework.common.objects.Uid, org.identityconnectors.framework.common.objects.OperationOptions, java.util.Set)
      */
+    @Override
     public void delete(final PropagationMode propagationMode, final ObjectClass objectClass, final Uid uid,
             final OperationOptions options, final Set<String> propagationAttempted) {
 
@@ -248,13 +231,10 @@ public class ConnectorFacadeProxy {
         }
     }
 
-    /**
-     * Sync users from a connector instance.
-     *
-     * @param objectClass ConnId's object class.
-     * @param token to be passed to the underlying connector
-     * @param handler to be used to handle deltas.
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#sync(org.identityconnectors.framework.common.objects.ObjectClass, org.identityconnectors.framework.common.objects.SyncToken, org.identityconnectors.framework.common.objects.SyncResultsHandler, org.identityconnectors.framework.common.objects.OperationOptions)
      */
+    @Override
     public void sync(final ObjectClass objectClass, final SyncToken token, final SyncResultsHandler handler,
             final OperationOptions options) {
 
@@ -266,12 +246,10 @@ public class ConnectorFacadeProxy {
         }
     }
 
-    /**
-     * Read latest sync token from a connector instance.
-     *
-     * @param objectClass ConnId's object class.
-     * @return latest sync token
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#getLatestSyncToken(org.identityconnectors.framework.common.objects.ObjectClass)
      */
+    @Override
     public SyncToken getLatestSyncToken(final ObjectClass objectClass) {
         SyncToken result = null;
 
@@ -285,29 +263,18 @@ public class ConnectorFacadeProxy {
         return result;
     }
 
-    /**
-     * Get remote object.
-     *
-     * @param objectClass ConnId's object class
-     * @param uid ConnId's Uid
-     * @param options ConnId's OperationOptions
-     * @return ConnId's connector object for given uid
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#getObject(org.identityconnectors.framework.common.objects.ObjectClass, org.identityconnectors.framework.common.objects.Uid, org.identityconnectors.framework.common.objects.OperationOptions)
      */
+    @Override
     public ConnectorObject getObject(final ObjectClass objectClass, final Uid uid, final OperationOptions options) {
         return getObject(null, null, objectClass, uid, options);
     }
 
-    /**
-     * Get remote object used by the propagation manager in order to choose for a create (object doesn't exist) or an
-     * update (object exists).
-     *
-     * @param propagationMode propagation mode
-     * @param operationType resource operation type
-     * @param objectClass ConnId's object class
-     * @param uid ConnId's Uid
-     * @param options ConnId's OperationOptions
-     * @return ConnId's connector object for given uid
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#getObject(org.apache.syncope.types.PropagationMode, org.apache.syncope.types.ResourceOperation, org.identityconnectors.framework.common.objects.ObjectClass, org.identityconnectors.framework.common.objects.Uid, org.identityconnectors.framework.common.objects.OperationOptions)
      */
+    @Override
     public ConnectorObject getObject(final PropagationMode propagationMode, final ResourceOperation operationType,
             final ObjectClass objectClass, final Uid uid, final OperationOptions options) {
 
@@ -350,6 +317,10 @@ public class ConnectorFacadeProxy {
         return result;
     }
 
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#search(org.identityconnectors.framework.common.objects.ObjectClass, org.identityconnectors.framework.common.objects.filter.Filter, org.identityconnectors.framework.common.objects.OperationOptions)
+     */
+    @Override
     public List<ConnectorObject> search(final ObjectClass objectClass, final Filter filter,
             final OperationOptions options) {
 
@@ -371,14 +342,10 @@ public class ConnectorFacadeProxy {
         return result;
     }
 
-    /**
-     * Get remote object used by the propagation manager in order to choose for a create (object doesn't exist) or an
-     * update (object exists).
-     *
-     * @param objectClass ConnId's object class.
-     * @param handler to be used to handle deltas.
-     * @param options ConnId's OperationOptions.
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#getAllObjects(org.identityconnectors.framework.common.objects.ObjectClass, org.identityconnectors.framework.common.objects.SyncResultsHandler, org.identityconnectors.framework.common.objects.OperationOptions)
      */
+    @Override
     public void getAllObjects(final ObjectClass objectClass, final SyncResultsHandler handler,
             final OperationOptions options) {
 
@@ -403,15 +370,10 @@ public class ConnectorFacadeProxy {
         }
     }
 
-    /**
-     * Read attribute for a given connector object.
-     *
-     * @param objectClass ConnId's object class
-     * @param uid ConnId's Uid
-     * @param options ConnId's OperationOptions
-     * @param attributeName attribute to read
-     * @return attribute (if present)
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#getObjectAttribute(org.identityconnectors.framework.common.objects.ObjectClass, org.identityconnectors.framework.common.objects.Uid, org.identityconnectors.framework.common.objects.OperationOptions, java.lang.String)
      */
+    @Override
     public Attribute getObjectAttribute(final ObjectClass objectClass, final Uid uid, final OperationOptions options,
             final String attributeName) {
 
@@ -427,13 +389,10 @@ public class ConnectorFacadeProxy {
         return attribute;
     }
 
-    /**
-     *
-     * @param objectClass ConnId's object class
-     * @param uid ConnId's Uid
-     * @param options ConnId's OperationOptions
-     * @return attributes (if present)
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#getObjectAttributes(org.identityconnectors.framework.common.objects.ObjectClass, org.identityconnectors.framework.common.objects.Uid, org.identityconnectors.framework.common.objects.OperationOptions)
      */
+    @Override
     public Set<Attribute> getObjectAttributes(final ObjectClass objectClass, final Uid uid,
             final OperationOptions options) {
 
@@ -451,12 +410,10 @@ public class ConnectorFacadeProxy {
         return attributes;
     }
 
-    /**
-     * Return resource schema names.
-     *
-     * @param showall return special attributes (like as __NAME__ or __PASSWORD__) if true
-     * @return a list of schema names
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#getSchema(boolean)
      */
+    @Override
     public Set<String> getSchema(final boolean showall) {
         final Set<String> resourceSchemaNames = new HashSet<String>();
 
@@ -478,29 +435,34 @@ public class ConnectorFacadeProxy {
         return resourceSchemaNames;
     }
 
-    /**
-     * Validate a connector instance.
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#validate()
      */
+    @Override
     public void validate() {
         connector.validate();
     }
 
-    /**
-     * Check connection to resource.
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#test()
      */
+    @Override
     public void test() {
         connector.test();
     }
 
-    /**
-     * Getter for active connector instance.
-     *
-     * @return active connector instance.
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#getActiveConnInstance()
      */
+    @Override
     public ConnInstance getActiveConnInstance() {
         return activeConnInstance;
     }
 
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#getOperationOptions(java.util.Collection)
+     */
+    @Override
     public OperationOptions getOperationOptions(final Collection<AbstractMappingItem> mapItems) {
         // -------------------------------------
         // Ask just for mapped attributes
@@ -565,9 +527,13 @@ public class ConnectorFacadeProxy {
         return (name.startsWith("__") && name.endsWith("__"));
     }
 
+    /* (non-Javadoc)
+     * @see org.apache.syncope.core.propagation.impl.SyncopeConnector#toString()
+     */
     @Override
     public String toString() {
         return "ConnectorFacadeProxy{"
                 + "connector=" + connector + "\n" + "capabitilies=" + activeConnInstance.getCapabilities() + '}';
     }
+
 }

Copied: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/DefaultPropagationHandler.java (from r1433968, syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/DefaultPropagationHandler.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/DefaultPropagationHandler.java?p2=syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/DefaultPropagationHandler.java&p1=syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/DefaultPropagationHandler.java&r1=1433968&r2=1434636&rev=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/DefaultPropagationHandler.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/DefaultPropagationHandler.java Thu Jan 17 12:13:11 2013
@@ -16,11 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.propagation;
+package org.apache.syncope.core.propagation.impl;
 
 import java.util.List;
 import org.apache.syncope.client.to.PropagationTO;
 import org.apache.syncope.core.connid.ConnObjectUtil;
+import org.apache.syncope.core.propagation.PropagationHandler;
 import org.apache.syncope.types.PropagationTaskExecStatus;
 import org.identityconnectors.framework.common.objects.ConnectorObject;
 

Copied: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java (from r1433968, syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/LDAPMembershipPropagationActions.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java?p2=syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java&p1=syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/LDAPMembershipPropagationActions.java&r1=1433968&r2=1434636&rev=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/LDAPMembershipPropagationActions.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/LDAPMembershipPropagationActions.java Thu Jan 17 12:13:11 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.propagation;
+package org.apache.syncope.core.propagation.impl;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -29,6 +29,7 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.core.persistence.dao.UserDAO;
+import org.apache.syncope.core.propagation.DefaultPropagationActions;
 import org.apache.syncope.core.util.JexlUtil;
 import org.apache.syncope.types.AttributableType;
 import org.apache.syncope.types.ResourceOperation;

Copied: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PriorityPropagationTaskExecutor.java (from r1433968, syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PriorityPropagationTaskExecutor.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PriorityPropagationTaskExecutor.java?p2=syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PriorityPropagationTaskExecutor.java&p1=syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PriorityPropagationTaskExecutor.java&r1=1433968&r2=1434636&rev=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PriorityPropagationTaskExecutor.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PriorityPropagationTaskExecutor.java Thu Jan 17 12:13:11 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.propagation;
+package org.apache.syncope.core.propagation.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,6 +25,8 @@ import java.util.Comparator;
 import java.util.List;
 import org.apache.syncope.core.persistence.beans.PropagationTask;
 import org.apache.syncope.core.persistence.beans.TaskExec;
+import org.apache.syncope.core.propagation.PropagationException;
+import org.apache.syncope.core.propagation.PropagationHandler;
 import org.apache.syncope.types.PropagationTaskExecStatus;
 
 public class PriorityPropagationTaskExecutor extends AbstractPropagationTaskExecutor {

Copied: syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java (from r1434615, syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java)
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java?p2=syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java&p1=syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java&r1=1434615&r2=1434636&rev=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/PropagationManager.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/propagation/impl/PropagationManager.java Thu Jan 17 12:13:11 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.syncope.core.propagation;
+package org.apache.syncope.core.propagation.impl;
 
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
@@ -42,6 +42,7 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.core.persistence.dao.ResourceDAO;
 import org.apache.syncope.core.persistence.dao.SchemaDAO;
+import org.apache.syncope.core.propagation.PropagationByResource;
 import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.rest.data.AbstractAttributableDataBinder;
 import org.apache.syncope.core.rest.data.RoleDataBinder;

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java Thu Jan 17 12:13:11 2013
@@ -36,8 +36,9 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.persistence.dao.ConnInstanceDAO;
 import org.apache.syncope.core.persistence.dao.MissingConfKeyException;
 import org.apache.syncope.core.persistence.dao.ResourceDAO;
-import org.apache.syncope.core.propagation.ConnectorFacadeProxy;
 import org.apache.syncope.core.propagation.ConnectorFactory;
+import org.apache.syncope.core.propagation.SyncopeConnector;
+import org.apache.syncope.core.propagation.impl.ConnectorFacadeProxy;
 import org.apache.syncope.core.rest.data.ConnInstanceDataBinder;
 import org.apache.syncope.core.util.ConnBundleManager;
 import org.apache.syncope.core.util.NotFoundException;
@@ -365,7 +366,7 @@ public class ConnInstanceController exte
     public ModelAndView check(final HttpServletResponse response, @RequestBody final ConnInstanceTO connectorTO)
             throws SyncopeClientCompositeErrorException, NotFoundException {
 
-        final ConnectorFacadeProxy connector = new ConnectorFacadeProxy(binder.getConnInstance(connectorTO),
+        final SyncopeConnector connector = new ConnectorFacadeProxy(binder.getConnInstance(connectorTO),
                 bundleManager);
 
         boolean result;
@@ -431,7 +432,7 @@ public class ConnInstanceController exte
             throw new NotFoundException("Resource '" + resourceName + "'");
         }
 
-        final ConnectorFacadeProxy connector = connLoader.getConnector(resource);
+        final SyncopeConnector connector = connLoader.getConnector(resource);
 
         auditManager.audit(Category.connector, ConnectorSubCategory.readConnectorBean, Result.success,
                 "Successfully read connector for resource: " + resourceName);

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java Thu Jan 17 12:13:11 2013
@@ -31,8 +31,9 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.persistence.beans.ExternalResource;
 import org.apache.syncope.core.persistence.dao.ConnInstanceDAO;
 import org.apache.syncope.core.persistence.dao.ResourceDAO;
-import org.apache.syncope.core.propagation.ConnectorFacadeProxy;
 import org.apache.syncope.core.propagation.ConnectorFactory;
+import org.apache.syncope.core.propagation.SyncopeConnector;
+import org.apache.syncope.core.propagation.impl.ConnectorFacadeProxy;
 import org.apache.syncope.core.rest.data.ResourceDataBinder;
 import org.apache.syncope.core.util.AttributableUtil;
 import org.apache.syncope.core.util.ConnBundleManager;
@@ -218,7 +219,7 @@ public class ResourceController extends 
         AttributableUtil attrUtil = AttributableUtil.getInstance(type);
         ObjectClass objectClass = AttributableType.USER == type ? ObjectClass.ACCOUNT : ObjectClass.GROUP;
 
-        final ConnectorFacadeProxy connector = connLoader.getConnector(resource);
+        final SyncopeConnector connector = connLoader.getConnector(resource);
 
         final ConnectorObject connectorObject = connector.getObject(objectClass, new Uid(objectId),
                 connector.getOperationOptions(attrUtil.getMappingItems(resource)));
@@ -251,7 +252,7 @@ public class ResourceController extends 
 
         final ConnInstance connInstance = binder.getConnInstance(resourceTO);
 
-        final ConnectorFacadeProxy connector = new ConnectorFacadeProxy(connInstance, bundleManager);
+        final SyncopeConnector connector = new ConnectorFacadeProxy(connInstance, bundleManager);
 
         boolean result;
         try {

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java Thu Jan 17 12:13:11 2013
@@ -36,10 +36,10 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.persistence.dao.InvalidSearchConditionException;
 import org.apache.syncope.core.persistence.dao.RoleDAO;
 import org.apache.syncope.core.persistence.dao.UserDAO;
-import org.apache.syncope.core.propagation.DefaultPropagationHandler;
 import org.apache.syncope.core.propagation.PropagationException;
-import org.apache.syncope.core.propagation.PropagationManager;
 import org.apache.syncope.core.propagation.PropagationTaskExecutor;
+import org.apache.syncope.core.propagation.impl.DefaultPropagationHandler;
+import org.apache.syncope.core.propagation.impl.PropagationManager;
 import org.apache.syncope.core.rest.data.RoleDataBinder;
 import org.apache.syncope.core.util.AttributableUtil;
 import org.apache.syncope.core.util.EntitlementUtil;

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java Thu Jan 17 12:13:11 2013
@@ -40,10 +40,10 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.persistence.dao.AttributableSearchDAO;
 import org.apache.syncope.core.persistence.dao.InvalidSearchConditionException;
 import org.apache.syncope.core.persistence.dao.UserDAO;
-import org.apache.syncope.core.propagation.DefaultPropagationHandler;
 import org.apache.syncope.core.propagation.PropagationException;
-import org.apache.syncope.core.propagation.PropagationManager;
 import org.apache.syncope.core.propagation.PropagationTaskExecutor;
+import org.apache.syncope.core.propagation.impl.DefaultPropagationHandler;
+import org.apache.syncope.core.propagation.impl.PropagationManager;
 import org.apache.syncope.core.rest.data.UserDataBinder;
 import org.apache.syncope.core.util.AttributableUtil;
 import org.apache.syncope.core.util.EntitlementUtil;

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/LDAPMembershipSyncActions.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/LDAPMembershipSyncActions.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/LDAPMembershipSyncActions.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/LDAPMembershipSyncActions.java Thu Jan 17 12:13:11 2013
@@ -35,11 +35,11 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.persistence.beans.membership.Membership;
 import org.apache.syncope.core.persistence.beans.role.SyncopeRole;
 import org.apache.syncope.core.persistence.dao.RoleDAO;
-import org.apache.syncope.core.propagation.ConnectorFacadeProxy;
 import org.apache.syncope.core.propagation.ConnectorFactory;
 import org.apache.syncope.core.propagation.PropagationException;
-import org.apache.syncope.core.propagation.PropagationManager;
 import org.apache.syncope.core.propagation.PropagationTaskExecutor;
+import org.apache.syncope.core.propagation.SyncopeConnector;
+import org.apache.syncope.core.propagation.impl.PropagationManager;
 import org.apache.syncope.core.util.AttributableUtil;
 import org.apache.syncope.core.workflow.WorkflowResult;
 import org.apache.syncope.core.workflow.user.UserWorkflowAdapter;
@@ -62,7 +62,7 @@ import org.springframework.transaction.a
  * Simple action for synchronizing LDAP groups memberships to Syncope role memberships, when the same resource is
  * configured for both users and roles.
  *
- * @see org.apache.syncope.core.propagation.LDAPMembershipPropagationActions
+ * @see org.apache.syncope.core.propagation.impl.LDAPMembershipPropagationActions
  */
 public class LDAPMembershipSyncActions extends DefaultSyncActions {
 
@@ -158,7 +158,7 @@ public class LDAPMembershipSyncActions e
      * @return value of attribute returned by getGroupMembershipAttrName()
      * @see getGroupMembershipAttrName()
      */
-    protected List<Object> getMembAttrValues(final SyncDelta delta, final ConnectorFacadeProxy connector) {
+    protected List<Object> getMembAttrValues(final SyncDelta delta, final SyncopeConnector connector) {
         List<Object> result = Collections.<Object>emptyList();
 
         // first, try to read the configured attribute from delta, returned by the ongoing synchronization
@@ -220,7 +220,7 @@ public class LDAPMembershipSyncActions e
         final SyncTask task = handler.getSyncTask();
         final ExternalResource resource = task.getResource();
 
-        ConnectorFacadeProxy connector;
+        SyncopeConnector connector;
         try {
             connector = connInstanceLoader.getConnector(resource);
         } catch (Exception e) {

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncJob.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncJob.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncJob.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncJob.java Thu Jan 17 12:13:11 2013
@@ -31,8 +31,8 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.persistence.beans.user.UMapping;
 import org.apache.syncope.core.persistence.dao.EntitlementDAO;
 import org.apache.syncope.core.persistence.dao.ResourceDAO;
-import org.apache.syncope.core.propagation.ConnectorFacadeProxy;
 import org.apache.syncope.core.propagation.ConnectorFactory;
+import org.apache.syncope.core.propagation.SyncopeConnector;
 import org.apache.syncope.core.quartz.AbstractTaskJob;
 import org.apache.syncope.core.util.ApplicationContextProvider;
 import org.apache.syncope.core.util.EntitlementUtil;
@@ -313,7 +313,7 @@ public class SyncJob extends AbstractTas
         }
         final SyncTask syncTask = (SyncTask) this.task;
 
-        ConnectorFacadeProxy connector;
+        SyncopeConnector connector;
         try {
             connector = connInstanceLoader.getConnector(syncTask.getResource());
         } catch (Exception e) {

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHandler.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHandler.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHandler.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/sync/SyncopeSyncResultHandler.java Thu Jan 17 12:13:11 2013
@@ -53,8 +53,8 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.persistence.dao.UserDAO;
 import org.apache.syncope.core.persistence.validation.attrvalue.ParsingValidationException;
 import org.apache.syncope.core.propagation.PropagationException;
-import org.apache.syncope.core.propagation.PropagationManager;
 import org.apache.syncope.core.propagation.PropagationTaskExecutor;
+import org.apache.syncope.core.propagation.impl.PropagationManager;
 import org.apache.syncope.core.rest.controller.UnauthorizedRoleException;
 import org.apache.syncope.core.rest.data.RoleDataBinder;
 import org.apache.syncope.core.rest.data.UserDataBinder;

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/WorkflowUserSuspender.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/WorkflowUserSuspender.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/WorkflowUserSuspender.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/WorkflowUserSuspender.java Thu Jan 17 12:13:11 2013
@@ -25,8 +25,8 @@ import org.apache.syncope.client.to.User
 import org.apache.syncope.core.persistence.beans.PropagationTask;
 import org.apache.syncope.core.persistence.beans.user.SyncopeUser;
 import org.apache.syncope.core.policy.UserSuspender;
-import org.apache.syncope.core.propagation.PropagationManager;
 import org.apache.syncope.core.propagation.PropagationTaskExecutor;
+import org.apache.syncope.core.propagation.impl.PropagationManager;
 import org.apache.syncope.core.rest.data.UserDataBinder;
 import org.apache.syncope.core.workflow.user.UserWorkflowAdapter;
 import org.slf4j.Logger;

Modified: syncope/trunk/core/src/main/resources/syncopeContext.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/resources/syncopeContext.xml?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/main/resources/syncopeContext.xml (original)
+++ syncope/trunk/core/src/main/resources/syncopeContext.xml Thu Jan 17 12:13:11 2013
@@ -67,8 +67,8 @@ under the License.
     </property>
   </bean>
   
-  <bean id="propagationManager" class="org.apache.syncope.core.propagation.PropagationManager"/>
-  <bean id="propagationTaskExecutor" class="org.apache.syncope.core.propagation.PriorityPropagationTaskExecutor"/>
+  <bean id="propagationManager" class="org.apache.syncope.core.propagation.impl.PropagationManager"/>
+  <bean id="propagationTaskExecutor" class="org.apache.syncope.core.propagation.impl.PriorityPropagationTaskExecutor"/>
     
   <bean id="notificationManager" class="org.apache.syncope.core.notification.NotificationManager"/>
   

Modified: syncope/trunk/core/src/test/java/org/apache/syncope/core/init/ConnInstanceLoaderTest.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/init/ConnInstanceLoaderTest.java?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/test/java/org/apache/syncope/core/init/ConnInstanceLoaderTest.java (original)
+++ syncope/trunk/core/src/test/java/org/apache/syncope/core/init/ConnInstanceLoaderTest.java Thu Jan 17 12:13:11 2013
@@ -27,7 +27,7 @@ import org.springframework.test.util.Ref
 import org.springframework.transaction.annotation.Transactional;
 import org.apache.syncope.core.AbstractTest;
 import org.apache.syncope.core.persistence.dao.ResourceDAO;
-import org.apache.syncope.core.propagation.ConnectorFacadeProxy;
+import org.apache.syncope.core.propagation.SyncopeConnector;
 import org.apache.syncope.core.rest.data.ResourceDataBinder;
 import org.apache.syncope.core.util.ApplicationContextProvider;
 import org.apache.syncope.core.util.ConnBundleManager;
@@ -56,7 +56,7 @@ public class ConnInstanceLoaderTest exte
         // Remove any other connector instance bean set up by
         // standard ConnInstanceLoader.load()
         for (String bean : ApplicationContextProvider.getApplicationContext().
-                getBeanNamesForType(ConnectorFacadeProxy.class)) {
+                getBeanNamesForType(SyncopeConnector.class)) {
 
             cil.unregisterConnector(bean);
         }
@@ -68,6 +68,6 @@ public class ConnInstanceLoaderTest exte
 
         assertEquals(resourceDAO.findAll().size(),
                 ApplicationContextProvider.getApplicationContext().
-                getBeanNamesForType(ConnectorFacadeProxy.class).length);
+                getBeanNamesForType(SyncopeConnector.class).length);
     }
 }

Modified: syncope/trunk/core/src/test/resources/content.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/content.xml?rev=1434636&r1=1434635&r2=1434636&view=diff
==============================================================================
--- syncope/trunk/core/src/test/resources/content.xml (original)
+++ syncope/trunk/core/src/test/resources/content.xml Thu Jan 17 12:13:11 2013
@@ -373,7 +373,7 @@ under the License.
   <ExternalResource name="resource-ldap" connector_id="105"
                     enforceMandatoryCondition="1" propagationMode="ONE_PHASE"
                     propagationPriority="0" propagationPrimary="1"
-                    propagationActionsClassName="org.apache.syncope.core.propagation.LDAPMembershipPropagationActions"
+                    propagationActionsClassName="org.apache.syncope.core.propagation.impl.LDAPMembershipPropagationActions"
                     createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"/>
   <ExternalResource name="ws-target-resource-nopropagation" connector_id="103"
                     enforceMandatoryCondition="1" propagationMode="TWO_PHASES"