From 13b22d66441b94f002d9fa7f0986bf281d2183b9 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Tue, 17 Mar 2015 12:10:39 +0100
Subject: [PATCH] KEYCLOAK-1107 saml and oidc broker options don't sho

---
 .../modules/org/keycloak/keycloak-broker-saml/main/module.xml | 4 +---
 .../org/keycloak/services/DefaultKeycloakSessionFactory.java  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml
index f16869073d..646ab63642 100755
--- a/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml
+++ b/distribution/modules/src/main/resources/modules/org/keycloak/keycloak-broker-saml/main/module.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-
-
 <module xmlns="urn:jboss:module:1.1" name="org.keycloak.keycloak-broker-saml">
     <resources>
         <!-- Insert resources here -->
@@ -10,6 +8,6 @@
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-model-api"/>
         <module name="org.keycloak.keycloak-broker-core"/>
+        <module name="org.picketlink.common"/>
     </dependencies>
-
 </module>
diff --git a/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java b/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java
index dc03c490b4..89146fc2e0 100755
--- a/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java
+++ b/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java
@@ -50,7 +50,7 @@ public class DefaultKeycloakSessionFactory implements KeycloakSessionFactory {
     public void init() {
         ProviderManager pm = new ProviderManager(getClass().getClassLoader(), Config.scope().getArray("providers"));
 
-        for (Spi spi : ServiceLoader.load(Spi.class)) {
+        for (Spi spi : ServiceLoader.load(Spi.class, getClass().getClassLoader())) {
             Map<String, ProviderFactory> factories = new HashMap<String, ProviderFactory>();
             factoriesMap.put(spi.getProviderClass(), factories);