keycloak-memoizeit

Merge pull request #1454 from brmeyer/KEYCLOAK-1563 KEYCLOAK-1563

7/15/2015 4:37:00 AM

Details

diff --git a/docbook/reference/en/en-US/modules/jboss-adapter.xml b/docbook/reference/en/en-US/modules/jboss-adapter.xml
index f379490..08949b4 100755
--- a/docbook/reference/en/en-US/modules/jboss-adapter.xml
+++ b/docbook/reference/en/en-US/modules/jboss-adapter.xml
@@ -199,7 +199,7 @@ public class CustomerService {
         <title>Securing WARs via Keycloak Subsystem</title>
         <para>
             You do not have to crack open a WAR to secure it with Keycloak.  Alternatively, you can externally secure
-            it via the Keycloak Subsystem.  While you don't have to specify KEYCLOAK as an <literal>auth-method</literal>,
+            it via the Keycloak Adapter Subsystem.  While you don't have to specify KEYCLOAK as an <literal>auth-method</literal>,
             you still have to define the <literal>security-constraints</literal> in <literal>web.xml</literal>.  You do
             not, however, have to create a <literal>WEB-INF/keycloak.json</literal> file.  This metadata is instead defined
             within XML in your server's <literal>domain.xml</literal> or <literal>standalone.xml</literal> subsystem
@@ -207,20 +207,22 @@ public class CustomerService {
         </para>
 <para>
 <programlisting><![CDATA[
-<server xmlns="urn:jboss:domain:1.4">
+<extensions>
+  <extension module="org.keycloak.keycloak-adapter-subsystem"/>
+</extensions>
 
-  <profile>
-    <subsystem xmlns="urn:jboss:domain:keycloak:1.0">
-       <secure-deployment name="WAR MODULE NAME.war">
-          <realm>demo</realm>
-          <realm-public-key>MIGfMA0GCSqGSIb3DQEBAQUAA</realm-public-key>
-          <auth-server-url>http://localhost:8081/auth</auth-server-url>
-          <ssl-required>external</ssl-required>
-          <resource>customer-portal</resource>
-          <credential name="secret">password</credential>
-       </secure-deployment>
-    </subsystem>
-  </profile>
+<profile>
+  <subsystem xmlns="urn:jboss:domain:keycloak:1.1">
+     <secure-deployment name="WAR MODULE NAME.war">
+        <realm>demo</realm>
+        <realm-public-key>MIGfMA0GCSqGSIb3DQEBAQUAA</realm-public-key>
+        <auth-server-url>http://localhost:8081/auth</auth-server-url>
+        <ssl-required>external</ssl-required>
+        <resource>customer-portal</resource>
+        <credential name="secret">password</credential>
+     </secure-deployment>
+  </subsystem>
+</profile>
 ]]>
 </programlisting>
 </para>
@@ -242,7 +244,7 @@ public class CustomerService {
         </para>
         <para>
             <programlisting><![CDATA[
-<subsystem xmlns="urn:jboss:domain:keycloak:1.0">
+<subsystem xmlns="urn:jboss:domain:keycloak:1.1">
     <realm name="demo">
         <realm-public-key>MIGfMA0GCSqGSIb3DQEBA</realm-public-key>
         <auth-server-url>http://localhost:8080/auth</auth-server-url>
diff --git a/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml b/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml
index 2815f6f..5996b6d 100755
--- a/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml
+++ b/docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml
@@ -103,11 +103,11 @@
                 </para>
             </simplesect>
             <simplesect>
-                <title>WildFly 9.0.0.CR2</title>
+                <title>WildFly 9.0.0.Final</title>
                 <para>
                     Following on from the distribution changes that was done in the last release the standalone download
-                    of Keycloak is now based on WildFly 9.0.0.CR2. This als affects the overlay which can only be deployed
-                    to WildFly 9.0.0.CR2 or JBoss EAP 6.4.0.GA. WildFly 8.2.0.Final is no longer supported for the server.
+                    of Keycloak is now based on WildFly 9.0.0.Final. This als affects the overlay which can only be deployed
+                    to WildFly 9.0.0.Final or JBoss EAP 6.4.0.GA. WildFly 8.2.0.Final is no longer supported for the server.
                 </para>
             </simplesect>
             <simplesect>
diff --git a/docbook/reference/en/en-US/modules/server-installation.xml b/docbook/reference/en/en-US/modules/server-installation.xml
index ddc5f33..9584852 100755
--- a/docbook/reference/en/en-US/modules/server-installation.xml
+++ b/docbook/reference/en/en-US/modules/server-installation.xml
@@ -43,10 +43,10 @@
 
 
         <section id="overlay_install">
-            <title>Install on existing WildFly 9.0.0.CR2</title>
+            <title>Install on existing WildFly 9.0.0.Final</title>
             <para>
-                Keycloak can be installed into an existing WildFly 9.0.0.CR2 server. To do this download
-                <literal>keycloak-overlay-&project.version;.zip</literal> or  <literal>keycloak-overlay-&project.version;.tar.gz</literal>.
+                Keycloak can be installed into an existing WildFly 9.0.0.Final server. To do this download
+                <literal>keycloak-overlay-&project.version;.zip</literal> or <literal>keycloak-overlay-&project.version;.tar.gz</literal>.
                 Once downloaded extract into the root directory of your WildFly installation. To start WildFly with Keycloak
                 run:
                 <programlisting>keycloak-&project.version;/bin/standalone.sh --server-config=standalone-keycloak.xml</programlisting>
@@ -65,16 +65,16 @@
                 to, for example <literal>standalone/configuration/standalone.xml</literal>. From <literal>standalone-keycloak.xml</literal>
                 you need to copy 3 elements:
                 <itemizedlist>
-                    <listitem><literal>&lt;extension module="org.keycloak.keycloak-subsystem"/&gt;</literal></listitem>
+                    <listitem><literal>&lt;extension module="org.keycloak.keycloak-server-subsystem"/&gt;</literal></listitem>
                     <listitem><literal>&lt;datasource jndi-name="java:jboss/datasources/KeycloakDS" ...&gt;</literal></listitem>
-                    <listitem><literal>&lt;subsystem xmlns="urn:jboss:domain:keycloak:1.0" ...&gt;</literal></listitem>
+                    <listitem><literal>&lt;subsystem xmlns="urn:jboss:domain:keycloak-server:1.1" ...&gt;</literal></listitem>
                 </itemizedlist>
             </para>
         </section>
         <section>
             <title>Install on existing JBoss EAP 6.4.0.GA</title>
             <para>
-                Same procedure as JBoss EAP 6.4.0.GA, but download <literal>keycloak-overlay-eap6-&project.version;.zip</literal> or  <literal>keycloak-overlay-eap6-&project.version;.tar.gz</literal>.
+                Same procedure as WildFly 9.0.0.Final, but download <literal>keycloak-overlay-eap6-&project.version;.zip</literal> or <literal>keycloak-overlay-eap6-&project.version;.tar.gz</literal>.
             </para>
         </section>
         <section>
@@ -84,7 +84,7 @@
                 To install it first download <literal>keycloak-demo-&project.version;.zip</literal> or
                 <literal>keycloak-demo-&project.version;.tar.gz</literal>. Once downloaded extract it inside
                 <literal>keycloak-demo-&project.version;</literal> you'll find <literal>keycloak</literal> which contains
-                a full WildFly 9.0.0.CR2 server with Keycloak Server and Adapters included. You'll also find <literal>docs</literal>
+                a full WildFly 9.0.0.Final server with Keycloak Server and Adapters included. You'll also find <literal>docs</literal>
                 and <literal>examples</literal> which contains everything you need to get started developing applications that use Keycloak.
             </para>
             <para>