keycloak-uncached
Changes
distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml 23(+0 -23)
distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml 28(+14 -14)
distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml 6(+0 -6)
distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml 6(+0 -6)
distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml 22(+9 -13)
distribution/server-overlay/pom.xml 2(+1 -1)
pom.xml 6(+3 -3)
testsuite/tomcat6/pom.xml 5(+0 -5)
testsuite/tomcat7/pom.xml 18(+12 -6)
testsuite/tomcat8/pom.xml 14(+7 -7)
Details
diff --git a/distribution/demo-dist/src/main/xslt/standalone.xsl b/distribution/demo-dist/src/main/xslt/standalone.xsl
index 9f52547..2110908 100755
--- a/distribution/demo-dist/src/main/xslt/standalone.xsl
+++ b/distribution/demo-dist/src/main/xslt/standalone.xsl
@@ -1,7 +1,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xalan="http://xml.apache.org/xalan"
- xmlns:j="urn:jboss:domain:3.0"
- xmlns:ds="urn:jboss:domain:datasources:3.0"
+ xmlns:j="urn:jboss:domain:4.0"
+ xmlns:ds="urn:jboss:domain:datasources:4.0"
xmlns:k="urn:jboss:domain:keycloak:1.1"
xmlns:sec="urn:jboss:domain:security:1.2"
version="2.0"
@@ -25,7 +25,7 @@
<xsl:template match="//ds:datasources">
<xsl:copy>
<xsl:apply-templates select="node()[name(.)='datasource']"/>
- <datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true">
+ <datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" use-java-context="true">
<connection-url>jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE</connection-url>
<driver>h2</driver>
<security>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml
index 582aa42..29c6e63 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/subsystems.xml
@@ -4,7 +4,6 @@
<subsystems name="default">
<!-- Each subsystem to be included relative to the src/main/resources directory -->
<subsystem>logging.xml</subsystem>
- <subsystem>batch.xml</subsystem>
<subsystem>bean-validation.xml</subsystem>
<subsystem>keycloak-datasources.xml</subsystem>
<subsystem>ee.xml</subsystem>
@@ -19,23 +18,17 @@
<subsystem>jsf.xml</subsystem>
<subsystem>mail.xml</subsystem>
<subsystem>naming.xml</subsystem>
- <subsystem>pojo.xml</subsystem>
<subsystem>remoting.xml</subsystem>
- <subsystem>resource-adapters.xml</subsystem>
<subsystem>request-controller.xml</subsystem>
- <subsystem>sar.xml</subsystem>
<subsystem>security.xml</subsystem>
<subsystem>security-manager.xml</subsystem>
<subsystem>transactions.xml</subsystem>
<subsystem>undertow.xml</subsystem>
- <subsystem>webservices.xml</subsystem>
- <subsystem>weld.xml</subsystem>
<subsystem>keycloak-server.xml</subsystem>
</subsystems>
<subsystems name="ha">
<!-- Each subsystem to be included relative to the src/main/resources directory -->
<subsystem>logging.xml</subsystem>
- <subsystem>batch.xml</subsystem>
<subsystem>bean-validation.xml</subsystem>
<subsystem>keycloak-datasources.xml</subsystem>
<subsystem>ee.xml</subsystem>
@@ -52,23 +45,17 @@
<subsystem>mail.xml</subsystem>
<subsystem>mod_cluster.xml</subsystem>
<subsystem>naming.xml</subsystem>
- <subsystem>pojo.xml</subsystem>
<subsystem>remoting.xml</subsystem>
- <subsystem>resource-adapters.xml</subsystem>
<subsystem>request-controller.xml</subsystem>
- <subsystem>sar.xml</subsystem>
<subsystem>security.xml</subsystem>
<subsystem>security-manager.xml</subsystem>
<subsystem>transactions.xml</subsystem>
<subsystem supplement="ha">undertow.xml</subsystem>
- <subsystem>webservices.xml</subsystem>
- <subsystem>weld.xml</subsystem>
<subsystem>keycloak-server.xml</subsystem>
</subsystems>
<subsystems name="full">
<!-- Each subsystem to be included relative to the src/main/resources directory -->
<subsystem>logging.xml</subsystem>
- <subsystem>batch.xml</subsystem>
<subsystem>bean-validation.xml</subsystem>
<subsystem>keycloak-datasources.xml</subsystem>
<subsystem supplement="full">ee.xml</subsystem>
@@ -86,23 +73,17 @@
<subsystem>mail.xml</subsystem>
<subsystem>messaging.xml</subsystem>
<subsystem>naming.xml</subsystem>
- <subsystem>pojo.xml</subsystem>
<subsystem>remoting.xml</subsystem>
- <subsystem>resource-adapters.xml</subsystem>
<subsystem>request-controller.xml</subsystem>
- <subsystem>sar.xml</subsystem>
<subsystem>security.xml</subsystem>
<subsystem>security-manager.xml</subsystem>
<subsystem>transactions.xml</subsystem>
<subsystem>undertow.xml</subsystem>
- <subsystem>webservices.xml</subsystem>
- <subsystem>weld.xml</subsystem>
<subsystem>keycloak-server.xml</subsystem>
</subsystems>
<subsystems name="full-ha">
<!-- Each subsystem to be included relative to the src/main/resources directory -->
<subsystem>logging.xml</subsystem>
- <subsystem>batch.xml</subsystem>
<subsystem>bean-validation.xml</subsystem>
<subsystem>keycloak-datasources.xml</subsystem>
<subsystem supplement="full">ee.xml</subsystem>
@@ -122,17 +103,13 @@
<subsystem supplement="ha">messaging.xml</subsystem>
<subsystem>mod_cluster.xml</subsystem>
<subsystem>naming.xml</subsystem>
- <subsystem>pojo.xml</subsystem>
<subsystem>remoting.xml</subsystem>
<subsystem>resource-adapters.xml</subsystem>
<subsystem>request-controller.xml</subsystem>
- <subsystem>sar.xml</subsystem>
<subsystem>security.xml</subsystem>
<subsystem>security-manager.xml</subsystem>
<subsystem>transactions.xml</subsystem>
<subsystem supplement="ha">undertow.xml</subsystem>
- <subsystem>webservices.xml</subsystem>
- <subsystem>weld.xml</subsystem>
<subsystem>keycloak-server.xml</subsystem>
</subsystems>
</config>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml
index cf3cccc..8c4464c 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/domain/template.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
-<domain xmlns="urn:jboss:domain:3.0">
+<domain xmlns="urn:jboss:domain:4.0">
<extensions>
<?EXTENSIONS?>
@@ -24,18 +24,18 @@
</management>
<profiles>
- <profile name="default">
- <?SUBSYSTEMS socket-binding-group="standard-sockets"?>
- </profile>
- <profile name="ha">
- <?SUBSYSTEMS socket-binding-group="ha-sockets"?>
- </profile>
- <profile name="full">
- <?SUBSYSTEMS socket-binding-group="full-sockets"?>
- </profile>
- <profile name="full-ha">
- <?SUBSYSTEMS socket-binding-group="full-ha-sockets"?>
- </profile>
+ <profile name="default">
+ <?SUBSYSTEMS socket-binding-group="standard-sockets"?>
+ </profile>
+ <profile name="ha">
+ <?SUBSYSTEMS socket-binding-group="ha-sockets"?>
+ </profile>
+ <profile name="full">
+ <?SUBSYSTEMS socket-binding-group="full-sockets"?>
+ </profile>
+ <profile name="full-ha">
+ <?SUBSYSTEMS socket-binding-group="full-ha-sockets"?>
+ </profile>
</profiles>
<!--
@@ -48,7 +48,7 @@
<interfaces>
<interface name="management"/>
<interface name="public"/>
- <interface name="unsecure"/>
+ <?INTERFACES?>
</interfaces>
<socket-binding-groups>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml
index f1dff32..72f9890 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems.xml
@@ -3,7 +3,6 @@
<config>
<subsystems>
<subsystem>logging.xml</subsystem>
- <subsystem>batch.xml</subsystem>
<subsystem>bean-validation.xml</subsystem>
<subsystem>keycloak-datasources.xml</subsystem>
<subsystem>ee.xml</subsystem>
@@ -18,17 +17,12 @@
<subsystem>jsf.xml</subsystem>
<subsystem>mail.xml</subsystem>
<subsystem>naming.xml</subsystem>
- <subsystem>pojo.xml</subsystem>
<subsystem>remoting.xml</subsystem>
- <subsystem>resource-adapters.xml</subsystem>
<subsystem>request-controller.xml</subsystem>
- <subsystem>sar.xml</subsystem>
<subsystem>security-manager.xml</subsystem>
<subsystem>security.xml</subsystem>
<subsystem>transactions.xml</subsystem>
<subsystem>undertow.xml</subsystem>
- <subsystem>webservices.xml</subsystem>
- <subsystem>weld.xml</subsystem>
<subsystem>keycloak-server.xml</subsystem>
</subsystems>
</config>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml
index c402990..151ab71 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/subsystems-ha.xml
@@ -3,7 +3,6 @@
<config>
<subsystems>
<subsystem>logging.xml</subsystem>
- <subsystem>batch.xml</subsystem>
<subsystem>bean-validation.xml</subsystem>
<subsystem>keycloak-datasources.xml</subsystem>
<subsystem>ee.xml</subsystem>
@@ -20,17 +19,12 @@
<subsystem>mail.xml</subsystem>
<subsystem>mod_cluster.xml</subsystem>
<subsystem>naming.xml</subsystem>
- <subsystem>pojo.xml</subsystem>
<subsystem>remoting.xml</subsystem>
- <subsystem>resource-adapters.xml</subsystem>
<subsystem>request-controller.xml</subsystem>
- <subsystem>sar.xml</subsystem>
<subsystem>security-manager.xml</subsystem>
<subsystem>security.xml</subsystem>
<subsystem>transactions.xml</subsystem>
<subsystem supplement="ha">undertow.xml</subsystem>
- <subsystem>webservices.xml</subsystem>
- <subsystem>weld.xml</subsystem>
<subsystem>keycloak-server.xml</subsystem>
</subsystems>
</config>
\ No newline at end of file
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml
index 2260468..76fbe9e 100644
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/configuration/standalone/template.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
-<server xmlns="urn:jboss:domain:3.0">
+<server xmlns="urn:jboss:domain:4.0">
<extensions>
<?EXTENSIONS?>
@@ -29,15 +29,15 @@
</security-realms>
<audit-log>
<formatters>
- <json-formatter name="json-formatter"/>
- </formatters>
+ <json-formatter name="json-formatter"/>
+ </formatters>
<handlers>
- <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
+ <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
</handlers>
<logger log-boot="true" log-read-only="false" enabled="false">
- <handlers>
- <handler name="file"/>
- </handlers>
+ <handlers>
+ <handler name="file"/>
+ </handlers>
</logger>
</audit-log>
<management-interfaces>
@@ -70,11 +70,7 @@
<inet-address value="${jboss.bind.address:127.0.0.1}"/>
</interface>
<!-- TODO - only show this if the jacorb subsystem is added -->
- <interface name="unsecure">
- <!-- Used for IIOP sockets in the standard configuration.
- To secure JacORB you need to setup SSL -->
- <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
- </interface>
+ <?INTERFACES?>
</interfaces>
<socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
@@ -84,4 +80,4 @@
<?SOCKET-BINDINGS?>
</socket-binding-group>
-</server>
+</server>
\ No newline at end of file
distribution/server-overlay/pom.xml 2(+1 -1)
diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml
index 8d89c13..7285031 100755
--- a/distribution/server-overlay/pom.xml
+++ b/distribution/server-overlay/pom.xml
@@ -15,7 +15,7 @@
<modules>
- <module>wf9-server-overlay</module>
+ <module>wildfly</module>
<module>eap6</module>
</modules>
</project>
pom.xml 6(+3 -3)
diff --git a/pom.xml b/pom.xml
index b074d3f..b2038aa 100755
--- a/pom.xml
+++ b/pom.xml
@@ -48,9 +48,9 @@
<dom4j.version>1.6.1</dom4j.version>
<xml-apis.version>1.4.01</xml-apis.version>
<slf4j.version>1.7.7</slf4j.version>
- <wildfly.version>9.0.2.Final</wildfly.version>
- <wildfly.core.version>1.0.2.Final</wildfly.core.version>
- <wildfly.build-tools.version>1.0.0.Final</wildfly.build-tools.version>
+ <wildfly.version>10.0.0.CR4</wildfly.version>
+ <wildfly.core.version>2.0.1.Final</wildfly.core.version>
+ <wildfly.build-tools.version>1.1.0.Final</wildfly.build-tools.version>
<!-- this is EAP 6.4 alpha, publicly available -->
<jboss.version>7.5.0.Final-redhat-15</jboss.version>
testsuite/tomcat6/pom.xml 5(+0 -5)
diff --git a/testsuite/tomcat6/pom.xml b/testsuite/tomcat6/pom.xml
index 6a4b45b..cc50c0c 100755
--- a/testsuite/tomcat6/pom.xml
+++ b/testsuite/tomcat6/pom.xml
@@ -184,11 +184,6 @@
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-chrome-driver</artifactId>
</dependency>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-undertow</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-testsuite-integration</artifactId>
testsuite/tomcat7/pom.xml 18(+12 -6)
diff --git a/testsuite/tomcat7/pom.xml b/testsuite/tomcat7/pom.xml
index 7ea9b2e..05950a8 100755
--- a/testsuite/tomcat7/pom.xml
+++ b/testsuite/tomcat7/pom.xml
@@ -33,6 +33,18 @@
<artifactId>tomcat-embed-core</artifactId>
<version>7.0.59</version>
</dependency>
+
+ <!-- Undertow's fork of Jasper JSP parser -->
+ <dependency>
+ <groupId>io.undertow.jastow</groupId>
+ <artifactId>jastow</artifactId>
+ <version>2.0.0.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.3_spec</artifactId>
+ <version>1.0.1.Final</version>
+ </dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-dependencies-server-all</artifactId>
@@ -204,12 +216,6 @@
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-chrome-driver</artifactId>
</dependency>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-undertow</artifactId>
- <version>${wildfly.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-testsuite-integration</artifactId>
testsuite/tomcat8/pom.xml 14(+7 -7)
diff --git a/testsuite/tomcat8/pom.xml b/testsuite/tomcat8/pom.xml
index 7084f09..6611d8f 100755
--- a/testsuite/tomcat8/pom.xml
+++ b/testsuite/tomcat8/pom.xml
@@ -188,12 +188,6 @@
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-chrome-driver</artifactId>
</dependency>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-undertow</artifactId>
- <version>${wildfly.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-testsuite-integration</artifactId>
@@ -222,7 +216,13 @@
<version>${tomcat.version}</version>
</dependency>
- </dependencies>
+ <!-- Undertow's fork of Jasper JSP parser -->
+ <dependency>
+ <groupId>io.undertow.jastow</groupId>
+ <artifactId>jastow</artifactId>
+ <version>2.0.0.Final</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>