Repository: syncope Updated Branches: refs/heads/2_0_X 2dbd7a29a -> 6213a3200 refs/heads/master 252285a8c -> 243d5ca46
PropagationTaskExecution missing from platform info Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/243d5ca4 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/243d5ca4 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/243d5ca4 Branch: refs/heads/master Commit: 243d5ca466b5dbe7191f485ebe041190ce83e6c3 Parents: 252285a Author: Francesco Chicchiriccò <[email protected]> Authored: Fri Sep 29 15:49:29 2017 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Fri Sep 29 15:53:00 2017 +0200 ---------------------------------------------------------------------- .../org/apache/syncope/common/lib/info/PlatformInfo.java | 10 ++++++++++ .../java/org/apache/syncope/core/logic/SyncopeLogic.java | 5 +++++ 2 files changed, 15 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/243d5ca4/common/lib/src/main/java/org/apache/syncope/common/lib/info/PlatformInfo.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/info/PlatformInfo.java b/common/lib/src/main/java/org/apache/syncope/common/lib/info/PlatformInfo.java index f7f93d6..4d7e4f9 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/info/PlatformInfo.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/info/PlatformInfo.java @@ -47,6 +47,8 @@ public class PlatformInfo extends AbstractBaseBean { private final Set<String> connIdLocations = new HashSet<>(); + private String propagationTaskExecutor; + private String anyObjectWorkflowAdapter; private String userWorkflowAdapter; @@ -132,6 +134,10 @@ public class PlatformInfo extends AbstractBaseBean { return connIdLocations; } + public String getPropagationTaskExecutor() { + return propagationTaskExecutor; + } + public String getAnyObjectWorkflowAdapter() { return anyObjectWorkflowAdapter; } @@ -336,6 +342,10 @@ public class PlatformInfo extends AbstractBaseBean { this.pwdResetRequiringSecurityQuestions = pwdResetRequiringSecurityQuestions; } + public void setPropagationTaskExecutor(final String propagationTaskExecutor) { + this.propagationTaskExecutor = propagationTaskExecutor; + } + public void setAnyObjectWorkflowAdapter(final String anyObjectWorkflowAdapter) { this.anyObjectWorkflowAdapter = anyObjectWorkflowAdapter; } http://git-wip-us.apache.org/repos/asf/syncope/blob/243d5ca4/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java ---------------------------------------------------------------------- diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java index b5b2973..95027d8 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/SyncopeLogic.java @@ -74,6 +74,7 @@ import org.apache.syncope.core.provisioning.api.GroupProvisioningManager; import org.apache.syncope.core.provisioning.api.UserProvisioningManager; import org.apache.syncope.core.provisioning.api.cache.VirAttrCache; import org.apache.syncope.core.provisioning.api.data.GroupDataBinder; +import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecutor; import org.apache.syncope.core.spring.security.AuthContextUtils; import org.apache.syncope.core.workflow.api.AnyObjectWorkflowAdapter; import org.apache.syncope.core.workflow.api.GroupWorkflowAdapter; @@ -151,6 +152,9 @@ public class SyncopeLogic extends AbstractLogic<AbstractBaseBean> { private ConnIdBundleManager bundleManager; @Autowired + private PropagationTaskExecutor propagationTaskExecutor; + + @Autowired private AnyObjectWorkflowAdapter awfAdapter; @Autowired @@ -205,6 +209,7 @@ public class SyncopeLogic extends AbstractLogic<AbstractBaseBean> { forEach(location -> PLATFORM_INFO.getConnIdLocations().add(location.toASCIIString())); } + PLATFORM_INFO.setPropagationTaskExecutor(AopUtils.getTargetClass(propagationTaskExecutor).getName()); PLATFORM_INFO.setAnyObjectWorkflowAdapter(AopUtils.getTargetClass(awfAdapter).getName()); PLATFORM_INFO.setUserWorkflowAdapter(AopUtils.getTargetClass(uwfAdapter).getName()); PLATFORM_INFO.setGroupWorkflowAdapter(AopUtils.getTargetClass(gwfAdapter).getName());
