Merge pull request #1991 from stianst/master

KEYCLOAK-2272
This commit is contained in:
Stian Thorgersen 2016-01-08 14:34:31 +01:00
commit 71bcf697cc
4 changed files with 15 additions and 4 deletions

View file

@ -7,7 +7,7 @@ Keycloak is an SSO Service for web apps and REST services. For more information
Building Building
-------- --------
Ensure you have JDK 7 (or newer), Maven 3.2.1 (or newer) and Git installed Ensure you have JDK 8 (or newer), Maven 3.2.1 (or newer) and Git installed
java -version java -version
mvn -version mvn -version

View file

@ -4,7 +4,8 @@
<section> <section>
<title>Installation</title> <title>Installation</title>
<para> <para>
Keycloak Server has three downloadable distributions. Keycloak Server has three downloadable distributions. To run the Keycloak server you need to have Java 8 already
installed.
</para> </para>
<para> <para>
<itemizedlist> <itemizedlist>

View file

@ -2,7 +2,7 @@
<!-- See src/resources/configuration/ReadMe.txt for how the configuration assembly works --> <!-- See src/resources/configuration/ReadMe.txt for how the configuration assembly works -->
<config> <config>
<extension-module>org.jboss.as.connector</extension-module> <extension-module>org.jboss.as.connector</extension-module>
<subsystem xmlns="urn:jboss:domain:datasources:3.0"> <subsystem xmlns="urn:jboss:domain:datasources:4.0">
<datasources> <datasources>
<datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true"> <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url> <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>

View file

@ -2,7 +2,7 @@
<!-- See src/resources/configuration/ReadMe.txt for how the configuration assembly works --> <!-- See src/resources/configuration/ReadMe.txt for how the configuration assembly works -->
<config default-supplement="default"> <config default-supplement="default">
<extension-module>org.jboss.as.clustering.infinispan</extension-module> <extension-module>org.jboss.as.clustering.infinispan</extension-module>
<subsystem xmlns="urn:jboss:domain:infinispan:3.0"> <subsystem xmlns="urn:jboss:domain:infinispan:4.0">
<?CACHE-CONTAINERS?> <?CACHE-CONTAINERS?>
</subsystem> </subsystem>
<supplement name="default"> <supplement name="default">
@ -21,16 +21,19 @@
</cache-container> </cache-container>
<cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan"> <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
<local-cache name="passivation"> <local-cache name="passivation">
<locking isolation="REPEATABLE_READ"/>
<transaction mode="BATCH"/> <transaction mode="BATCH"/>
<file-store passivation="true" purge="false"/> <file-store passivation="true" purge="false"/>
</local-cache> </local-cache>
<local-cache name="persistent"> <local-cache name="persistent">
<locking isolation="REPEATABLE_READ"/>
<transaction mode="BATCH"/> <transaction mode="BATCH"/>
<file-store passivation="false" purge="false"/> <file-store passivation="false" purge="false"/>
</local-cache> </local-cache>
</cache-container> </cache-container>
<cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan"> <cache-container name="ejb" aliases="sfsb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan">
<local-cache name="passivation"> <local-cache name="passivation">
<locking isolation="REPEATABLE_READ"/>
<transaction mode="BATCH"/> <transaction mode="BATCH"/>
<file-store passivation="true" purge="false"/> <file-store passivation="true" purge="false"/>
</local-cache> </local-cache>
@ -45,6 +48,11 @@
<eviction strategy="LRU" max-entries="10000"/> <eviction strategy="LRU" max-entries="10000"/>
<expiration max-idle="100000"/> <expiration max-idle="100000"/>
</local-cache> </local-cache>
<local-cache name="immutable-entity">
<transaction mode="NON_XA"/>
<eviction strategy="LRU" max-entries="10000"/>
<expiration max-idle="100000"/>
</local-cache>
<local-cache name="local-query"> <local-cache name="local-query">
<eviction strategy="LRU" max-entries="10000"/> <eviction strategy="LRU" max-entries="10000"/>
<expiration max-idle="100000"/> <expiration max-idle="100000"/>
@ -72,6 +80,7 @@
<cache-container name="web" default-cache="dist" module="org.wildfly.clustering.web.infinispan"> <cache-container name="web" default-cache="dist" module="org.wildfly.clustering.web.infinispan">
<transport lock-timeout="60000"/> <transport lock-timeout="60000"/>
<distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2"> <distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2">
<locking isolation="REPEATABLE_READ"/>
<transaction mode="BATCH"/> <transaction mode="BATCH"/>
<file-store/> <file-store/>
</distributed-cache> </distributed-cache>
@ -79,6 +88,7 @@
<cache-container name="ejb" aliases="sfsb" default-cache="dist" module="org.wildfly.clustering.ejb.infinispan"> <cache-container name="ejb" aliases="sfsb" default-cache="dist" module="org.wildfly.clustering.ejb.infinispan">
<transport lock-timeout="60000"/> <transport lock-timeout="60000"/>
<distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2"> <distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2">
<locking isolation="REPEATABLE_READ"/>
<transaction mode="BATCH"/> <transaction mode="BATCH"/>
<file-store/> <file-store/>
</distributed-cache> </distributed-cache>