KEYCLOAK-955 Fix AeroGear project integration example

connections/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java

@@ -117,6 +117,10 @@ public class DefaultJpaConnectionProviderFactory implements JpaConnectionProvide
                         logger.trace("Updating database");
 
                         JpaUpdaterProvider updater = session.getProvider(JpaUpdaterProvider.class);
+                        if (updater == null) {
+                            throw new RuntimeException("Can't update database: JPA updater provider not found");
+                        }
+
                         connection = getConnection();
 
                         if (databaseSchema.equals("update")) {

dependencies/server-all/pom.xml

@@ -194,6 +194,12 @@
         <dependency>
             <groupId>de.idyl</groupId>
             <artifactId>winzipaes</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bouncycastle</groupId>
+                    <artifactId>bcprov-jdk16</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

dependencies/server-min/pom.xml

@@ -24,6 +24,10 @@
             <groupId>net.iharder</groupId>
             <artifactId>base64</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk16</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-core-jaxrs</artifactId>

project-integrations/aerogear-ups/app/src/main/java/org/keycloak/example/BootstrapListener.java

@@ -1,33 +0,0 @@
-package org.keycloak.example;
-
-import org.keycloak.adapters.AdapterDeploymentContext;
-import org.keycloak.enums.SslRequired;
-import org.keycloak.representations.adapters.config.AdapterConfig;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class BootstrapListener implements ServletContextListener {
-    @Override
-    public void contextInitialized(ServletContextEvent sce) {
-        AdapterDeploymentContext deploymentContext = (AdapterDeploymentContext)sce.getServletContext().getAttribute(AdapterDeploymentContext.class.getName());
-        AdapterConfig config = new AdapterConfig();
-        config.setRealm("aerogear");
-        config.setResource("unified-push-server");
-        config.setAuthServerUrl("/auth");
-        config.setSslRequired(SslRequired.EXTERNAL.name());
-        config.setPublicClient(true);
-        config.setDisableTrustManager(true);
-        deploymentContext.updateDeployment(config);
-
-    }
-
-    @Override
-    public void contextDestroyed(ServletContextEvent sce) {
-
-    }
-}

project-integrations/aerogear-ups/app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml

@@ -4,6 +4,7 @@
             <module name="org.apache.httpcomponents"/>
             <module name="org.codehaus.jackson.jackson-core-asl"/>
             <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+            <module name="org.jboss.xnio"/>
         </dependencies>
         <exclusions>
         </exclusions>

project-integrations/aerogear-ups/app/src/main/webapp/WEB-INF/keycloak.json

@@ -0,0 +1,8 @@
+{
+  "realm" : "aerogear",
+  "auth-server-url" : "/auth",
+  "ssl-required" : "external",
+  "resource" : "unified-push-server",
+  "public-client" : true,
+  "disable-trust-manager" : true
+}

project-integrations/aerogear-ups/app/src/main/webapp/WEB-INF/web.xml

@@ -6,11 +6,6 @@
 
 	<module-name>aerogear-ups</module-name>
 
-    <listener>
-        <listener-class>org.keycloak.example.BootstrapListener</listener-class>
-    </listener>
-
-
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>UPS</web-resource-name>
@@ -19,11 +14,6 @@
         <auth-constraint>
             <role-name>user</role-name>
         </auth-constraint>
-        <!--
-        <user-data-constraint>
-            <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-        </user-data-constraint>
-        -->
     </security-constraint>
 
     <security-constraint>
@@ -34,11 +24,6 @@
         <auth-constraint>
             <role-name>admin</role-name>
         </auth-constraint>
-        <!--
-        <user-data-constraint>
-            <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-        </user-data-constraint>
-        -->
     </security-constraint>
 
     <login-config>
@@ -53,7 +38,4 @@
         <role-name>user</role-name>
     </security-role>
 
-
-
-
 </web-app>

project-integrations/aerogear-ups/auth-server/pom.xml

@@ -33,12 +33,16 @@
             <artifactId>jboss-servlet-api_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-connections-jpa</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.keycloak</groupId>
+            <artifactId>keycloak-connections-jpa-liquibase</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-jpa</artifactId>

project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml

@@ -2,10 +2,10 @@
     <deployment>
         <dependencies>
             <module name="org.apache.httpcomponents"/>
-            <module name="org.bouncycastle"/>
             <module name="org.jboss.resteasy.resteasy-jackson-provider" services="import"/>
             <module name="org.codehaus.jackson.jackson-core-asl"/>
             <module name="org.codehaus.jackson.jackson-mapper-asl"/>
+            <module name="org.infinispan"/>
         </dependencies>
         <exclusions>
             <module name="org.jboss.resteasy.resteasy-jackson2-provider"/>
@@ -16,5 +16,8 @@
             <module name="org.keycloak.keycloak-undertow-adapter" />
             <module name="org.keycloak.keycloak-as7-adapter" />
         </exclusions>
+        <exclude-subsystems>
+            <subsystem name="webservices"/>
+        </exclude-subsystems>
     </deployment>
 </jboss-deployment-structure>