keycloak-uncached

diff --git a/examples/as7-eap-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java b/examples/as7-eap-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java
index ee95beb..df9af25 100755
--- a/examples/as7-eap-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java
+++ b/examples/as7-eap-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java
@@ -1,12 +1,11 @@
 package org.keycloak.example.demo;
 
-import org.keycloak.util.JsonSerialization;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.representations.idm.RealmRepresentation;
-import org.keycloak.services.managers.ApplianceBootstrap;
 import org.keycloak.services.managers.RealmManager;
 import org.keycloak.services.resources.KeycloakApplication;
+import org.keycloak.util.JsonSerialization;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.core.Context;
@@ -22,8 +21,6 @@ public class DemoApplication extends KeycloakApplication {
         super(servletContext);
         KeycloakSession session = factory.createSession();
         session.getTransaction().begin();
-        ApplianceBootstrap bootstrap = new ApplianceBootstrap();
-        bootstrap.bootstrap(session);
         install(new RealmManager(session));
         session.getTransaction().commit();
     }

diff --git a/examples/wildfly-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java b/examples/wildfly-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java
index ee95beb..df9af25 100755
--- a/examples/wildfly-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java
+++ b/examples/wildfly-demo/server/src/main/java/org/keycloak/example/demo/DemoApplication.java
@@ -1,12 +1,11 @@
 package org.keycloak.example.demo;
 
-import org.keycloak.util.JsonSerialization;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
 import org.keycloak.representations.idm.RealmRepresentation;
-import org.keycloak.services.managers.ApplianceBootstrap;
 import org.keycloak.services.managers.RealmManager;
 import org.keycloak.services.resources.KeycloakApplication;
+import org.keycloak.util.JsonSerialization;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.core.Context;
@@ -22,8 +21,6 @@ public class DemoApplication extends KeycloakApplication {
         super(servletContext);
         KeycloakSession session = factory.createSession();
         session.getTransaction().begin();
-        ApplianceBootstrap bootstrap = new ApplianceBootstrap();
-        bootstrap.bootstrap(session);
         install(new RealmManager(session));
         session.getTransaction().commit();
     }

diff --git a/examples/wildfly-demo/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/examples/wildfly-demo/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index 2654f31..07f3c5d 100755
--- a/examples/wildfly-demo/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/examples/wildfly-demo/server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -1,20 +1,30 @@
 <jboss-deployment-structure>
     <deployment>
+        <!--
+        <exclude-subsystems>
+            <subsystem name="jaxrs" />
+        </exclude-subsystems>
+        -->
         <exclusions>
 
             <!-- Exclude Version cxf of JBOSS -->
             <module name="org.apache.cxf" />
             <!-- Exclude JAVA EE of JBOSS (javax.ws..) => Add dependency javax.annotation -->
             <module name="javaee.api" />
+            <module name="javax.ws.rs.api"/>
             <!-- Exclude RestEasy conflict (javax.ws.rs.ext.RunDelegate) -->
+            <module name="org.codehaus.jackson.jackson-core-asl" />
             <module name="org.jboss.resteasy.resteasy-atom-provider" />
             <module name="org.jboss.resteasy.resteasy-cdi" />
-            <module name="org.jboss.resteasy.resteasy-jackson-provider" />
+            <module name="org.jboss.resteasy.resteasy-crypto" />
             <module name="org.jboss.resteasy.resteasy-jaxb-provider" />
             <module name="org.jboss.resteasy.resteasy-jaxrs" />
+            <module name="org.jboss.resteasy.resteasy-jackson-provider" />
             <module name="org.jboss.resteasy.resteasy-jettison-provider" />
+            <module name="org.jboss.resteasy.resteasy-json-p-provider" />
             <module name="org.jboss.resteasy.resteasy-jsapi" />
             <module name="org.jboss.resteasy.resteasy-multipart-provider" />
+            <module name="org.jboss.resteasy.resteasy-validator-provider-11" />
             <module name="org.jboss.resteasy.resteasy-yaml-provider" />
         </exclusions>
     </deployment>

diff --git a/integration/adapter-core/pom.xml b/integration/adapter-core/pom.xml
index 23d9114..0c720d8 100755
--- a/integration/adapter-core/pom.xml
+++ b/integration/adapter-core/pom.xml
@@ -42,7 +42,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.1.2</version>
+            <version>${apache.httpcomponents.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/integration/as7-eap6/adapter/pom.xml b/integration/as7-eap6/adapter/pom.xml
index 34a0ef9..5e2b9d5 100755
--- a/integration/as7-eap6/adapter/pom.xml
+++ b/integration/as7-eap6/adapter/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.1.2</version>
+            <version>${apache.httpcomponents.version}</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>

diff --git a/integration/servlet-oauth-client/pom.xml b/integration/servlet-oauth-client/pom.xml
index 038f1ab..c41777c 100755
--- a/integration/servlet-oauth-client/pom.xml
+++ b/integration/servlet-oauth-client/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.1.2</version>
+            <version>${apache.httpcomponents.version}</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>

diff --git a/integration/undertow/pom.xml b/integration/undertow/pom.xml
index f3ae801..3cda86e 100755
--- a/integration/undertow/pom.xml
+++ b/integration/undertow/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.1.2</version>
+            <version>${apache.httpcomponents.version}</version>
         </dependency>
         <dependency>
             <groupId>org.bouncycastle</groupId>

diff --git a/pom.xml b/pom.xml
index d65c2ab..c4b6978 100755
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
     <packaging>pom</packaging>
 
     <properties>
+        <apache.httpcomponents.version>4.1.2</apache.httpcomponents.version>
         <resteasy.version>3.0.5.Final</resteasy.version>
         <undertow.version>1.0.0.Beta28</undertow.version>
         <picketlink.version>2.5.0.Beta6</picketlink.version>
@@ -327,12 +328,11 @@
                 <artifactId>mysql-connector-java</artifactId>
                 <version>${mysql.version}</version>
             </dependency>
-            <!-- Keep this at 4.1.2 to make sure we're compatible with AS7 -->
             <!-- the dependency seems to override Resteasy 3.0.5's dependeing on 4.2.1
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.1.2</version>
+                <version>${apache.httpcomponents.version}</version>
             </dependency>
              -->
         </dependencies>

diff --git a/server/src/main/java/org/keycloak/server/KeycloakServerApplication.java b/server/src/main/java/org/keycloak/server/KeycloakServerApplication.java
index 4ebcae1..1b430d0 100755
--- a/server/src/main/java/org/keycloak/server/KeycloakServerApplication.java
+++ b/server/src/main/java/org/keycloak/server/KeycloakServerApplication.java
@@ -1,13 +1,12 @@
 package org.keycloak.server;
 
 import org.jboss.resteasy.logging.Logger;
-import org.keycloak.util.JsonSerialization;
-import org.keycloak.representations.idm.RealmRepresentation;
-import org.keycloak.services.managers.ApplianceBootstrap;
-import org.keycloak.services.managers.RealmManager;
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
+import org.keycloak.representations.idm.RealmRepresentation;
+import org.keycloak.services.managers.RealmManager;
 import org.keycloak.services.resources.KeycloakApplication;
+import org.keycloak.util.JsonSerialization;
 
 import javax.servlet.ServletContext;
 import javax.ws.rs.core.Context;
@@ -22,21 +21,19 @@ public class KeycloakServerApplication extends KeycloakApplication {
 
     public KeycloakServerApplication(@Context ServletContext servletContext) throws FileNotFoundException {
         super(servletContext);
-        KeycloakSession session = factory.createSession();
-        session.getTransaction().begin();
-        ApplianceBootstrap bootstrap = new ApplianceBootstrap();
-        bootstrap.bootstrap(session);
 
         String importRealm = System.getProperty("keycloak.import");
         if (importRealm != null) {
+            KeycloakSession session = factory.createSession();
+            session.getTransaction().begin();
             RealmRepresentation rep = loadJson(new FileInputStream(importRealm), RealmRepresentation.class);
             importRealm(session, rep);
+            session.getTransaction().commit();
         }
 
-        session.getTransaction().commit();
     }
 
-    public void importRealm(KeycloakSession session, RealmRepresentation rep ) {
+    public void importRealm(KeycloakSession session, RealmRepresentation rep) {
         try {
             RealmManager manager = new RealmManager(session);
 
@@ -62,7 +59,7 @@ public class KeycloakServerApplication extends KeycloakApplication {
 
     private static <T> T loadJson(InputStream is, Class<T> type) {
         try {
-             return JsonSerialization.readValue(is, type);
+            return JsonSerialization.readValue(is, type);
         } catch (IOException e) {
             throw new RuntimeException("Failed to parse json", e);
         }

diff --git a/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java b/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java
index 3fe1453..f62f28c 100755
--- a/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java
+++ b/services/src/main/java/org/keycloak/services/managers/ApplianceBootstrap.java
@@ -4,6 +4,7 @@ import org.jboss.resteasy.logging.Logger;
 import org.keycloak.models.ApplicationModel;
 import org.keycloak.models.Constants;
 import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.KeycloakSessionFactory;
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.RoleModel;
 import org.keycloak.models.UserCredentialModel;
@@ -20,6 +21,19 @@ public class ApplianceBootstrap {
 
     private static final Logger logger = Logger.getLogger(ApplianceBootstrap.class);
 
+    public void bootstrap(KeycloakSessionFactory factory) {
+        KeycloakSession session = factory.createSession();
+        session.getTransaction().begin();
+
+        try {
+            bootstrap(session);
+            session.getTransaction().commit();
+        } finally {
+            session.close();
+        }
+
+    }
+
     public void bootstrap(KeycloakSession session) {
         if (session.getRealm(Constants.ADMIN_REALM) != null) {
             return;

diff --git a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
index 93682c4..9e63dac 100755
--- a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
+++ b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
@@ -2,8 +2,13 @@ package org.keycloak.services.resources;
 
 import org.jboss.resteasy.logging.Logger;
 import org.keycloak.SkeletonKeyContextResolver;
+import org.keycloak.models.Constants;
+import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.KeycloakSessionFactory;
 import org.keycloak.models.ModelProvider;
+import org.keycloak.models.UserModel;
+import org.keycloak.services.managers.ApplianceBootstrap;
+import org.keycloak.services.managers.RealmManager;
 import org.keycloak.services.managers.SocialRequestManager;
 import org.keycloak.services.managers.TokenManager;
 
@@ -43,8 +48,15 @@ public class KeycloakApplication extends Application {
         singletons.add(new SocialResource(tokenManager, new SocialRequestManager()));
         classes.add(SkeletonKeyContextResolver.class);
         classes.add(QRCodeResource.class);
+
+        setupDefaultRealm();
+    }
+
+    protected void setupDefaultRealm() {
+        new ApplianceBootstrap().bootstrap(factory);
     }
 
+
     public static KeycloakSessionFactory createSessionFactory() {
         ServiceLoader<ModelProvider> providers = ServiceLoader.load(ModelProvider.class);
         String configuredProvider = System.getProperty(MODEL_PROVIDER);