From 9c5cd352cc1dd3a60a86b43ec5187f4bc1a944cf Mon Sep 17 00:00:00 2001
From: mposolda <mposolda@gmail.com>
Date: Wed, 19 Feb 2014 15:03:32 +0100
Subject: [PATCH] KEYCLOAK-319 Use keycloak-ds.xml just in WAR distribution

---
 distribution/appliance-dist/assembly.xml          |  3 +++
 .../appliance-dist/src/main/xslt/standalone.xsl   | 15 +++++++++++++++
 .../en/en-US/modules/server-installation.xml      | 14 ++++++++------
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/distribution/appliance-dist/assembly.xml b/distribution/appliance-dist/assembly.xml
index 97767425c4..1b81f3809e 100755
--- a/distribution/appliance-dist/assembly.xml
+++ b/distribution/appliance-dist/assembly.xml
@@ -34,6 +34,9 @@
         <fileSet>
             <directory>${project.build.directory}/unpacked/deployments</directory>
             <outputDirectory>keycloak/standalone/deployments</outputDirectory>
+            <excludes>
+                <exclude>keycloak-ds.xml</exclude>
+            </excludes>
         </fileSet>
         <fileSet>
             <directory>${project.build.directory}/unpacked/themes</directory>
diff --git a/distribution/appliance-dist/src/main/xslt/standalone.xsl b/distribution/appliance-dist/src/main/xslt/standalone.xsl
index 676fdf6e56..8f8011b082 100755
--- a/distribution/appliance-dist/src/main/xslt/standalone.xsl
+++ b/distribution/appliance-dist/src/main/xslt/standalone.xsl
@@ -16,6 +16,21 @@
         </xsl:copy>
     </xsl:template>
 
+    <xsl:template match="node()[name(.)='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">
+                <connection-url>jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE</connection-url>
+                <driver>h2</driver>
+                <security>
+                    <user-name>sa</user-name>
+                    <password>sa</password>
+                </security>
+            </datasource>
+            <xsl:apply-templates select="node()[name(.)='drivers']"/>
+        </xsl:copy>
+    </xsl:template>
+
     <xsl:template match="node()[name(.)='profile']">
         <xsl:copy>
             <xsl:apply-templates select="node()|@*"/>
diff --git a/docbook/reference/en/en-US/modules/server-installation.xml b/docbook/reference/en/en-US/modules/server-installation.xml
index 208928cc49..bcf1e77abd 100755
--- a/docbook/reference/en/en-US/modules/server-installation.xml
+++ b/docbook/reference/en/en-US/modules/server-installation.xml
@@ -18,7 +18,7 @@
         </itemizedlist>
 
     </para>
-    <section>
+    <section id="Appliance_install">
         <title>Appliance Install</title>
         <para>
             The
@@ -38,7 +38,6 @@ keycloak-appliance-dist-all-1.0-alpha-1/
             standalone.bat
             standalone/deployments/
                                    auth-server.war/
-                                   keycloak-ds.xml
 
     adapters/
         keycloak-as7-adapter-dist-1.0-alpha-1.zip
@@ -63,7 +62,7 @@ keycloak-appliance-dist-all-1.0-alpha-1/
             enter in a new password.
         </para>
     </section>
-    <section>
+    <section id="WAR_distribution_installation">
         <title>WAR Distribution Installation</title>
         <para>
             The
@@ -136,9 +135,12 @@ keycloak-war-dist-all-1.0-alpha-1/
             <title>Database Configuration</title>
             <para>
                 The datasource used to store Keycloak data is configured in the <literal>.../standalone/deployments/keycloak-ds.xml</literal>
-                file of your Keycloak Server installation.  A good thing to delete this file and move its configuration text into the
-                centrally managed <literal>.../standalone/configuration/standalone.xml</literal> file.  This will allow
-                you to manage the database connection pool from the Wildfly/JBoss adminstration console.  Here's what
+                file of your Keycloak Server installation if you used <xref linkend="WAR_distribution_installation" /> or in <literal>.../standalone/configuration/standalone.xml</literal>
+                if you used <xref linkend="Appliance_install" />. File <literal>keycloak-ds.xml</literal> is used in WAR
+                distribution, so that you have datasource available out of the box and you don't need to edit <literal>standalone.xml</literal> file.
+                However a good thing is to always delete the file  <literal>keycloak-ds.xml</literal> and move its configuration text
+                into the centrally managed <literal>standalone.xml</literal> file.
+                This will allow you to manage the database connection pool from the Wildfly/JBoss administration console.  Here's what
                 <literal>.../standalone/configuration/standalone.xml</literal> should look like after you've done this:
             </para>
             <para>