You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by mm...@apache.org on 2020/03/23 15:20:25 UTC

[syncope] branch SYNCOPE-163-1 updated: SYNCOPE-160: ensure ServiceOps is available in fits

This is an automated email from the ASF dual-hosted git repository.

mmoayyed pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
     new 84256d7  SYNCOPE-160: ensure ServiceOps is available in fits
84256d7 is described below

commit 84256d71807084ea1a6fed6da638695c7676ce44
Author: Misagh Moayyed <mm...@gmail.com>
AuthorDate: Mon Mar 23 19:50:11 2020 +0430

    SYNCOPE-160: ensure ServiceOps is available in fits
---
 wa/bootstrap/pom.xml                                               | 7 +++++++
 .../wa/bootstrap/RestfulCloudConfigBootstrapConfiguration.java     | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/wa/bootstrap/pom.xml b/wa/bootstrap/pom.xml
index 0d05ff6..ecf7f01 100644
--- a/wa/bootstrap/pom.xml
+++ b/wa/bootstrap/pom.xml
@@ -47,6 +47,13 @@ under the License.
       <groupId>org.apache.syncope.common.keymaster</groupId>
       <artifactId>syncope-common-keymaster-client-zookeeper</artifactId>
       <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.syncope.ext.self-keymaster</groupId>
+      <artifactId>syncope-ext-self-keymaster-client</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.apereo.cas</groupId>
diff --git a/wa/bootstrap/src/main/java/org/apache/syncope/wa/bootstrap/RestfulCloudConfigBootstrapConfiguration.java b/wa/bootstrap/src/main/java/org/apache/syncope/wa/bootstrap/RestfulCloudConfigBootstrapConfiguration.java
index 6a17240..2249220 100644
--- a/wa/bootstrap/src/main/java/org/apache/syncope/wa/bootstrap/RestfulCloudConfigBootstrapConfiguration.java
+++ b/wa/bootstrap/src/main/java/org/apache/syncope/wa/bootstrap/RestfulCloudConfigBootstrapConfiguration.java
@@ -19,6 +19,7 @@
 package org.apache.syncope.wa.bootstrap;
 
 import org.apache.syncope.common.keymaster.client.api.ServiceOps;
+import org.apache.syncope.common.keymaster.client.self.SelfKeymasterClientContext;
 import org.apache.syncope.common.keymaster.client.zookeper.ZookeeperKeymasterClientContext;
 import org.apache.syncope.wa.WARestClient;
 import org.slf4j.Logger;
@@ -37,7 +38,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 @Configuration(proxyBeanMethods = false)
-@ImportAutoConfiguration(ZookeeperKeymasterClientContext.class)
+@ImportAutoConfiguration(classes = {ZookeeperKeymasterClientContext.class, SelfKeymasterClientContext.class})
 @PropertySource("classpath:wa.properties")
 @PropertySource(value = "file:${conf.directory}/wa.properties", ignoreResourceNotFound = true)
 public class RestfulCloudConfigBootstrapConfiguration {