You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/01/05 14:34:19 UTC
[14/53] [abbrv] syncope git commit: Fixes #3 - Provisioning manager
properties file added
Fixes #3 - Provisioning manager properties file added
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8b161393
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8b161393
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8b161393
Branch: refs/heads/master
Commit: 8b1613934d47bd9db5276d08755f9111fd5a6a6c
Parents: efe6c5e
Author: giacomolm <gi...@hotmail.it>
Authored: Mon Dec 22 17:01:49 2014 +0100
Committer: giacomolm <gi...@hotmail.it>
Committed: Mon Dec 22 17:01:49 2014 +0100
----------------------------------------------------------------------
.../DefaultRoleCreatePropagation.java | 2 ++
.../DefaultRoleCreateSyncPropagation.java | 2 ++
.../DefaultRoleDeletePropagation.java | 2 ++
.../DefaultRoleDeprovisionPropagation.java | 2 ++
.../DefaultRoleUpdatePropagation.java | 2 ++
.../DefaultUserConfirmPwdResetPropagation.java | 3 +-
.../DefaultUserCreatePropagation.java | 2 ++
.../DefaultUserDeletePropagation.java | 3 +-
.../DefaultUserDeprovisionPropagation.java | 2 ++
.../DefaultUserStatusPropagation.java | 2 ++
.../DefaultUserUpdateInSyncPropagation.java | 2 ++
.../DefaultUserUpdatePropagation.java | 2 ++
.../DefaultUserWFSuspendPropagation.java | 2 ++
.../camel/processors/UserStatusOnSync.java | 2 ++
.../core/rest/controller/RoleController.java | 2 +-
.../core/rest/controller/UserController.java | 2 +-
.../sync/impl/AbstractSyncopeResultHandler.java | 4 +--
.../core/workflow/WorkflowUserSuspender.java | 2 +-
core/src/main/resources/camelRoute.xml | 4 +--
core/src/main/resources/coreContext.xml | 29 +++++---------------
core/src/main/resources/provisioning.properties | 19 +++++++++++++
21 files changed, 61 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreatePropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreatePropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreatePropagation.java
index a6b40fb..2c34090 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreatePropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreatePropagation.java
@@ -38,7 +38,9 @@ import org.apache.syncope.core.workflow.WorkflowResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+@Component
public class DefaultRoleCreatePropagation implements Processor{
private static final Logger LOG = LoggerFactory.getLogger(DefaultRoleCreatePropagation.class);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreateSyncPropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreateSyncPropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreateSyncPropagation.java
index ea8df72..c216c41 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreateSyncPropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleCreateSyncPropagation.java
@@ -38,7 +38,9 @@ import org.apache.syncope.core.persistence.beans.PropagationTask;
import org.apache.syncope.core.util.EntitlementUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+@Component
public class DefaultRoleCreateSyncPropagation implements Processor{
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeletePropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeletePropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeletePropagation.java
index 1d2c20e..6523b76 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeletePropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeletePropagation.java
@@ -37,7 +37,9 @@ import org.apache.syncope.core.workflow.role.RoleWorkflowAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+@Component
public class DefaultRoleDeletePropagation implements Processor{
private static final Logger LOG = LoggerFactory.getLogger(DefaultRoleDeletePropagation.class);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeprovisionPropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeprovisionPropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeprovisionPropagation.java
index 0f02258..77e9e73 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeprovisionPropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleDeprovisionPropagation.java
@@ -35,7 +35,9 @@ import org.apache.syncope.core.util.ApplicationContextProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+@Component
public class DefaultRoleDeprovisionPropagation implements Processor{
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserDeprovisionPropagation.class);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleUpdatePropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleUpdatePropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleUpdatePropagation.java
index cc2fcc0..30fe08d 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleUpdatePropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultRoleUpdatePropagation.java
@@ -37,7 +37,9 @@ import org.apache.syncope.core.workflow.WorkflowResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+@Component
public class DefaultRoleUpdatePropagation implements Processor{
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserUpdatePropagation.class);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserConfirmPwdResetPropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserConfirmPwdResetPropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserConfirmPwdResetPropagation.java
index 2447689..3ffa5b6 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserConfirmPwdResetPropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserConfirmPwdResetPropagation.java
@@ -32,8 +32,9 @@ import org.apache.syncope.core.util.ApplicationContextProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
-
+@Component
public class DefaultUserConfirmPwdResetPropagation implements Processor{
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserConfirmPwdResetPropagation.class);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserCreatePropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserCreatePropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserCreatePropagation.java
index c71e3dc..3d2b18d 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserCreatePropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserCreatePropagation.java
@@ -37,7 +37,9 @@ import org.apache.syncope.core.workflow.WorkflowResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+@Component
public class DefaultUserCreatePropagation implements Processor{
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserCreatePropagation.class);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeletePropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeletePropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeletePropagation.java
index 1afef83..b8fa699 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeletePropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeletePropagation.java
@@ -32,8 +32,9 @@ import org.apache.syncope.core.util.ApplicationContextProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
-
+@Component
public class DefaultUserDeletePropagation implements Processor{
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserDeletePropagation.class);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeprovisionPropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeprovisionPropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeprovisionPropagation.java
index f62e4b6..2d2eba9 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeprovisionPropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserDeprovisionPropagation.java
@@ -34,7 +34,9 @@ import org.apache.syncope.core.util.ApplicationContextProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+@Component
public class DefaultUserDeprovisionPropagation implements Processor{
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserDeprovisionPropagation.class);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserStatusPropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserStatusPropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserStatusPropagation.java
index 2cf1e6f..8bbc246 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserStatusPropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserStatusPropagation.java
@@ -39,7 +39,9 @@ import org.apache.syncope.core.workflow.WorkflowResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+@Component
public class DefaultUserStatusPropagation implements Processor{
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserStatusPropagation.class);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdateInSyncPropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdateInSyncPropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdateInSyncPropagation.java
index 6fdec75..48eb3d9 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdateInSyncPropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdateInSyncPropagation.java
@@ -39,7 +39,9 @@ import org.apache.syncope.core.workflow.WorkflowResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+@Component
public class DefaultUserUpdateInSyncPropagation implements Processor{
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserUpdateInSyncPropagation.class);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java
index 880912e..c8ffe34 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserUpdatePropagation.java
@@ -42,7 +42,9 @@ import org.apache.syncope.core.workflow.WorkflowResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+@Component
public class DefaultUserUpdatePropagation implements Processor{
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserUpdatePropagation.class);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserWFSuspendPropagation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserWFSuspendPropagation.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserWFSuspendPropagation.java
index 2d08b93..e20c84e 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserWFSuspendPropagation.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/DefaultUserWFSuspendPropagation.java
@@ -32,7 +32,9 @@ import org.apache.syncope.core.workflow.WorkflowResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+@Component
public class DefaultUserWFSuspendPropagation implements Processor{
private static final Logger LOG = LoggerFactory.getLogger(DefaultUserWFSuspendPropagation.class);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/UserStatusOnSync.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/UserStatusOnSync.java b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/UserStatusOnSync.java
index 7e4c18e..b2acdfb 100644
--- a/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/UserStatusOnSync.java
+++ b/core/src/main/java/org/apache/syncope/core/provisioning/camel/processors/UserStatusOnSync.java
@@ -30,7 +30,9 @@ import org.apache.syncope.core.workflow.user.UserWorkflowAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+@Component
public class UserStatusOnSync implements Processor{
private static final Logger LOG = LoggerFactory.getLogger(UserStatusOnSync.class);
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java b/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
index f7a2981..701dc5b 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
@@ -96,7 +96,7 @@ public class RoleController extends AbstractSubjectController<RoleTO, RoleMod> {
@Resource(name = "anonymousUser")
private String anonymousUser;
- @Resource(name = "defaultRoleProvisioningManager")
+ @Resource(name = "roleProvisioningManager")
protected RoleProvisioningManager provisioningManager;
@PreAuthorize("hasAnyRole('ROLE_READ', T(org.apache.syncope.common.SyncopeConstants).ANONYMOUS_ENTITLEMENT)")
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java b/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
index 606d46b..0a30a86 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
@@ -97,7 +97,7 @@ public class UserController extends AbstractSubjectController<UserTO, UserMod> {
@Autowired
protected AttributableTransformer attrTransformer;
- @Resource(name = "defaultUserProvisioningManager")
+ @Resource(name = "userProvisioningManager")
protected UserProvisioningManager provisioningManager;
@Transactional(readOnly = true)
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncopeResultHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncopeResultHandler.java b/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncopeResultHandler.java
index b356e64..78ada92 100644
--- a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncopeResultHandler.java
+++ b/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSyncopeResultHandler.java
@@ -103,10 +103,10 @@ public abstract class AbstractSyncopeResultHandler<T extends AbstractSyncTask, A
*/
protected SyncProfile<T, A> profile;
- @Resource(name = "defaultUserProvisioningManager")
+ @Resource(name = "userProvisioningManager")
protected UserProvisioningManager userProvisioningManager;
- @Resource(name = "defaultRoleProvisioningManager")
+ @Resource(name = "roleProvisioningManager")
protected RoleProvisioningManager roleProvisioningManager;
public void setProfile(final SyncProfile<T, A> profile) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/java/org/apache/syncope/core/workflow/WorkflowUserSuspender.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/workflow/WorkflowUserSuspender.java b/core/src/main/java/org/apache/syncope/core/workflow/WorkflowUserSuspender.java
index ef4a46d..512a240 100644
--- a/core/src/main/java/org/apache/syncope/core/workflow/WorkflowUserSuspender.java
+++ b/core/src/main/java/org/apache/syncope/core/workflow/WorkflowUserSuspender.java
@@ -40,7 +40,7 @@ public class WorkflowUserSuspender implements UserSuspender {
private static final Logger LOG = LoggerFactory.getLogger(WorkflowUserSuspender.class);
- @Resource(name = "defaultUserProvisioningManager")
+ @Resource(name = "userProvisioningManager")
protected UserProvisioningManager provisioningManager;
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/resources/camelRoute.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/camelRoute.xml b/core/src/main/resources/camelRoute.xml
index 260f01c..7cebf73 100644
--- a/core/src/main/resources/camelRoute.xml
+++ b/core/src/main/resources/camelRoute.xml
@@ -111,7 +111,7 @@ under the License.
<route id="syncUserStatus">
<from uri="direct:syncUserStatus"/>
<process ref="userStatusOnSync" />
- <process ref="defaultUserUpdateSyncPropagation" />
+ <process ref="defaultUserUpdateInSyncPropagation" />
<to uri="direct:updateSyncPort"/>
</route>
<!--
@@ -454,7 +454,7 @@ under the License.
<bean id="defaultUserCreatePropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserCreatePropagation"/>
<bean id="defaultUserUpdatePropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserUpdatePropagation"/>
<bean id="userStatusOnSync" class="org.apache.syncope.core.provisioning.camel.processors.UserStatusOnSync"/>
- <bean id="defaultUserUpdateSyncPropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserUpdateInSyncPropagation"/>
+ <bean id="defaultUserUpdateInSyncPropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserUpdateInSyncPropagation"/>
<bean id="defaultUserDeletePropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserDeletePropagation"/>
<bean id="defaultUserDeprovisionPropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserDeprovisionPropagation"/>
<bean id="defaultUserWFSuspendPropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserWFSuspendPropagation"/>
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/resources/coreContext.xml
----------------------------------------------------------------------
diff --git a/core/src/main/resources/coreContext.xml b/core/src/main/resources/coreContext.xml
index e39ceed..5aa2aeb 100644
--- a/core/src/main/resources/coreContext.xml
+++ b/core/src/main/resources/coreContext.xml
@@ -43,6 +43,7 @@ under the License.
<value>file:${conf.directory}/connid.properties</value>
<value>file:${conf.directory}/workflow.properties</value>
<value>file:${conf.directory}/mail.properties</value>
+ <value>file:${conf.directory}/provisioning.properties</value>
</list>
</property>
</bean>
@@ -55,6 +56,7 @@ under the License.
<value>classpath:connid.properties</value>
<value>classpath:workflow.properties</value>
<value>classpath:mail.properties</value>
+ <value>classpath:provisioning.properties</value>
</list>
</property>
</bean>
@@ -75,9 +77,7 @@ under the License.
<context:component-scan base-package="org.apache.syncope.core.workflow">
<context:exclude-filter type="regex" expression=".*\.activiti\..*"/>
</context:component-scan>
-
- <bean id="defaultUserProvisioningManager" class="org.apache.syncope.core.provisioning.DefaultUserProvisioningManager"/>
- <bean id="defaultRoleProvisioningManager" class="org.apache.syncope.core.provisioning.DefaultRoleProvisioningManager"/>
+ <context:component-scan base-package="org.apache.syncope.core.provisioning"/>
<bean id="nonJPAdbInitializer" class="org.springframework.jdbc.datasource.init.DataSourceInitializer">
<property name="dataSource" ref="dataSource"/>
@@ -151,23 +151,8 @@ under the License.
<constructor-arg value="60"/>
<constructor-arg value="5000"/>
</bean>
- <!-- Camel Context Definition -->
- <bean id="syncopeCamelContextFactory" class="org.apache.syncope.core.provisioning.camel.SyncopeCamelContext"/>
-
- <bean id="defaultUserCreatePropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserCreatePropagation"/>
- <bean id="defaultUserUpdatePropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserUpdatePropagation"/>
- <bean id="userStatusOnSync" class="org.apache.syncope.core.provisioning.camel.processors.UserStatusOnSync"/>
- <bean id="defaultUserUpdateSyncPropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserUpdateInSyncPropagation"/>
- <bean id="defaultUserDeletePropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserDeletePropagation"/>
- <bean id="defaultUserDeprovisionPropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserDeprovisionPropagation"/>
- <bean id="defaultUserWFSuspendPropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserWFSuspendPropagation"/>
- <bean id="defaultUserStatusPropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserStatusPropagation"/>
- <bean id="defaultUserConfirmPwdResetPropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultUserConfirmPwdResetPropagation"/>
- <bean id="defaultRoleCreatePropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultRoleCreatePropagation"/>
- <bean id="defaultRoleCreateSyncPropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultRoleCreateSyncPropagation"/>
- <bean id="defaultRoleUpdatePropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultRoleUpdatePropagation"/>
- <bean id="defaultRoleDeletePropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultRoleDeletePropagation"/>
- <bean id="defaultRoleDeprovisionPropagation" class="org.apache.syncope.core.provisioning.camel.processors.DefaultRoleDeprovisionPropagation"/>
-
- <bean id="routeController" class="org.apache.syncope.core.rest.controller.RouteController"/>
+ <!-- Camel Context Beans Definition -->
+ <bean id="userProvisioningManager" class="${userProvisioningManager}"/>
+ <bean id="roleProvisioningManager" class="${roleProvisioningManager}"/>
+ <bean id="routeController" class="org.apache.syncope.core.rest.controller.RouteController"/>
</beans>
http://git-wip-us.apache.org/repos/asf/syncope/blob/8b161393/core/src/main/resources/provisioning.properties
----------------------------------------------------------------------
diff --git a/core/src/main/resources/provisioning.properties b/core/src/main/resources/provisioning.properties
new file mode 100644
index 0000000..a8e49bf
--- /dev/null
+++ b/core/src/main/resources/provisioning.properties
@@ -0,0 +1,19 @@
+# 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.
+
+userProvisioningManager=org.apache.syncope.core.provisioning.camel.CamelUserProvisioningManager
+roleProvisioningManager=org.apache.syncope.core.provisioning.camel.CamelRoleProvisioningManager
\ No newline at end of file