Rename DistributableSingleSignOnManagerBuilder -> DistributableHostSi…

…ngleSignOnManagerBuilder to distinguish between undertow host-based SSO and elytron application security domain-based SSO.
wildfly · Jan 23, 2017 · e905f62 · e905f62
1 parent 993f685
commit e905f62
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/...java/org/wildfly/clustering/web/undertow/sso/DistributableSingleSignOnManagerBuilder.java b/...java/org/wildfly/clustering/web/undertow/sso/DistributableSingleSignOnManagerBuilder.java
@@ -39,19 +39,22 @@
 import org.jboss.msc.service.ValueService;
 import org.jboss.msc.value.InjectedValue;
 import org.jboss.msc.value.Value;
+import org.kohsuke.MetaInfServices;
 import org.wildfly.clustering.ee.Batch;
 import org.wildfly.clustering.service.Builder;
 import org.wildfly.clustering.web.sso.SSOManager;
 import org.wildfly.clustering.web.sso.SSOManagerFactory;
 import org.wildfly.clustering.web.sso.SSOManagerFactoryBuilderProvider;
 import org.wildfly.extension.undertow.UndertowService;
+import org.wildfly.extension.undertow.security.sso.DistributableHostSingleSignOnManagerBuilder;
 
 
 /**
  * Builds a distributable {@link SingleSignOnManagerFactory} service.
  * @author Paul Ferraro
  */
-public class DistributableSingleSignOnManagerBuilder implements org.wildfly.extension.undertow.security.sso.DistributableSingleSignOnManagerBuilder, Value<SingleSignOnManager> {
+@MetaInfServices(DistributableHostSingleSignOnManagerBuilder.class)
+public class DistributableSingleSignOnManagerBuilder implements DistributableHostSingleSignOnManagerBuilder, Value<SingleSignOnManager> {
 
     private static final SSOManagerFactoryBuilderProvider<Batch> PROVIDER = StreamSupport.stream(ServiceLoader.load(SSOManagerFactoryBuilderProvider.class, SSOManagerFactoryBuilderProvider.class.getClassLoader()).spliterator(), false).findFirst().get();
 

diff --git a/...vices/org.wildfly.extension.undertow.security.sso.DistributableSingleSignOnManagerBuilder b/...vices/org.wildfly.extension.undertow.security.sso.DistributableSingleSignOnManagerBuilder
diff --git a/undertow/src/main/java/org/wildfly/extension/undertow/SingleSignOnAdd.java b/undertow/src/main/java/org/wildfly/extension/undertow/SingleSignOnAdd.java
@@ -40,7 +40,7 @@
 import org.jboss.msc.service.ServiceTarget;
 import org.jboss.msc.service.ValueService;
 import org.jboss.msc.value.ImmediateValue;
-import org.wildfly.extension.undertow.security.sso.DistributableSingleSignOnManagerBuilder;
+import org.wildfly.extension.undertow.security.sso.DistributableHostSingleSignOnManagerBuilder;
 
 /**
  * @author <a href="mailto:tomaz.cerar@redhat.com">Tomaz Cerar</a> (c) 2014 Red Hat Inc.
@@ -74,8 +74,8 @@ protected void performRuntime(OperationContext context, ModelNode operation, Mod
         final ServiceTarget target = context.getServiceTarget();
 
         ServiceName managerServiceName = serviceName.append("manager");
-        if (DistributableSingleSignOnManagerBuilder.INSTANCE.isPresent()) {
+        if (DistributableHostSingleSignOnManagerBuilder.INSTANCE.isPresent()) {
-            DistributableSingleSignOnManagerBuilder builder = DistributableSingleSignOnManagerBuilder.INSTANCE.get();
+            DistributableHostSingleSignOnManagerBuilder builder = DistributableHostSingleSignOnManagerBuilder.INSTANCE.get();
             builder.build(target, managerServiceName, context.getCapabilityServiceSupport(), serverName, hostName).setInitialMode(ServiceController.Mode.ON_DEMAND).install();
         } else {
             target.addService(managerServiceName, new ValueService<>(new ImmediateValue<>(new InMemorySingleSignOnManager()))).setInitialMode(ServiceController.Mode.ON_DEMAND).install();

diff --git a/...tributableSingleSignOnManagerBuilder.java → ...utableHostSingleSignOnManagerBuilder.java b/...tributableSingleSignOnManagerBuilder.java → ...utableHostSingleSignOnManagerBuilder.java
@@ -37,9 +37,9 @@
  * Builds a distrubutable {@link SingleSignOnManagerFactory} service.
  * @author Paul Ferraro
  */
-public interface DistributableSingleSignOnManagerBuilder {
+public interface DistributableHostSingleSignOnManagerBuilder {
 
-    Optional<DistributableSingleSignOnManagerBuilder> INSTANCE = StreamSupport.stream(ServiceLoader.load(DistributableSingleSignOnManagerBuilder.class, DistributableSingleSignOnManagerBuilder.class.getClassLoader()).spliterator(), false).findFirst();
+    Optional<DistributableHostSingleSignOnManagerBuilder> INSTANCE = StreamSupport.stream(ServiceLoader.load(DistributableHostSingleSignOnManagerBuilder.class, DistributableHostSingleSignOnManagerBuilder.class.getClassLoader()).spliterator(), false).findFirst();
 
     /**
      * Builds a SingleSignOnManagerFactory service for a host.