From 28547b0620e8fcfe7ce5bab6ef1e5240705cdec6 Mon Sep 17 00:00:00 2001
From: mposolda <mposolda@gmail.com>
Date: Mon, 3 Nov 2014 10:41:49 +0100
Subject: [PATCH] Multitenancy example working on AS 7.1.1

---
 .../PathBasedKeycloakConfigResolver.java      |  8 +++++
 .../src/main/webapp/WEB-INF/jboss-ejb3.xml    | 31 -------------------
 2 files changed, 8 insertions(+), 31 deletions(-)
 delete mode 100644 examples/multi-tenant/src/main/webapp/WEB-INF/jboss-ejb3.xml

diff --git a/examples/multi-tenant/src/main/java/org/keycloak/example/multitenant/control/PathBasedKeycloakConfigResolver.java b/examples/multi-tenant/src/main/java/org/keycloak/example/multitenant/control/PathBasedKeycloakConfigResolver.java
index 4aa2fea2d0..44f7e78a1d 100644
--- a/examples/multi-tenant/src/main/java/org/keycloak/example/multitenant/control/PathBasedKeycloakConfigResolver.java
+++ b/examples/multi-tenant/src/main/java/org/keycloak/example/multitenant/control/PathBasedKeycloakConfigResolver.java
@@ -37,6 +37,11 @@ public class PathBasedKeycloakConfigResolver implements KeycloakConfigResolver {
     @Override
     public KeycloakDeployment resolve(HttpFacade.Request request) {
         String path = request.getURI();
+        int multitenantIndex = path.indexOf("multitenant/");
+        if (multitenantIndex == -1) {
+            throw new IllegalStateException("Not able to resolve realm from the request path!");
+        }
+
         String realm = path.substring(path.indexOf("multitenant/")).split("/")[1];
         if (realm.contains("?")) {
             realm = realm.split("\\?")[0];
@@ -46,6 +51,9 @@ public class PathBasedKeycloakConfigResolver implements KeycloakConfigResolver {
         if (null == deployment) {
             // not found on the simple cache, try to load it from the file system
             InputStream is = getClass().getResourceAsStream("/" + realm + "-keycloak.json");
+            if (is == null) {
+                throw new IllegalStateException("Not able to find the file /" + realm + "-keycloak.json");
+            }
             deployment = KeycloakDeploymentBuilder.build(is);
             cache.put(realm, deployment);
         }
diff --git a/examples/multi-tenant/src/main/webapp/WEB-INF/jboss-ejb3.xml b/examples/multi-tenant/src/main/webapp/WEB-INF/jboss-ejb3.xml
deleted file mode 100644
index 1693f7acbc..0000000000
--- a/examples/multi-tenant/src/main/webapp/WEB-INF/jboss-ejb3.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2014 Juraci Paixão Kröhling <juraci at kroehling.de>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
-<jboss:jboss
-        xmlns="http://java.sun.com/xml/ns/javaee"
-        xmlns:jboss="http://www.jboss.com/xml/ns/javaee"
-        xmlns:s="urn:security:1.1"
-        version="3.1" impl-version="2.0">
-
-    <assembly-descriptor>
-        <s:security>
-            <ejb-name>*</ejb-name>
-            <s:security-domain>keycloak</s:security-domain>
-        </s:security>
-    </assembly-descriptor>
-</jboss:jboss>
\ No newline at end of file