keycloak-memoizeit

diff --git a/distribution/appliance-dist/assembly.xml b/distribution/appliance-dist/assembly.xml
index 5f7247b..53de6bc 100755
--- a/distribution/appliance-dist/assembly.xml
+++ b/distribution/appliance-dist/assembly.xml
@@ -23,6 +23,7 @@
                 <exclude>welcome-content/*</exclude>
                 <exclude>**/modules/system/layers/base/org/picketlink/**</exclude>
                 <exclude>**/modules/system/layers/base/org/jboss/as/cli/**</exclude>
+                <exclude>**/modules/system/layers/base/org/jboss/aesh/**</exclude>
             </excludes>
         </fileSet>
         <fileSet>

diff --git a/distribution/modules/build.xml b/distribution/modules/build.xml
index f2f0c89..e101928 100755
--- a/distribution/modules/build.xml
+++ b/distribution/modules/build.xml
@@ -51,9 +51,13 @@
             <maven-resource group="org.bouncycastle" artifact="bcprov-jdk16"/>
         </module-def>
 
+        <module-def name="org.jboss.aesh">
+            <maven-resource group="org.jboss.aesh" artifact="aesh"/>
+        </module-def>
+
         <module-def name="org.jboss.as.cli">
             <maven-resource group="org.wildfly.core" artifact="wildfly-cli"/>
-        </module-def>
+        </module-def>        
 
         <module-def name="org.keycloak.keycloak-core">
             <maven-resource group="org.keycloak" artifact="keycloak-core"/>

diff --git a/distribution/modules/pom.xml b/distribution/modules/pom.xml
index cfcfccc..d0a9838 100755
--- a/distribution/modules/pom.xml
+++ b/distribution/modules/pom.xml
@@ -124,7 +124,10 @@
             <groupId>org.picketlink</groupId>
             <artifactId>picketlink-impl</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.jboss.aesh</groupId>
+            <artifactId>aesh</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/distribution/modules/src/main/resources/modules/org/jboss/aesh/main/module.xml b/distribution/modules/src/main/resources/modules/org/jboss/aesh/main/module.xml
new file mode 100644
index 0000000..8789ef3
--- /dev/null
+++ b/distribution/modules/src/main/resources/modules/org/jboss/aesh/main/module.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.3" name="org.jboss.aesh">
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
+    <resources>
+        <artifact name="org.jboss.aesh:aesh:0.33.12"/>
+    </resources>
+
+    <dependencies>
+        <module name="org.fusesource.jansi" />
+    </dependencies>
+</module>

diff --git a/distribution/modules/src/main/resources/modules/org/jboss/as/cli/main/wildfly-cli-1.0.0.Alpha11-SNAPSHOT.jar b/distribution/modules/src/main/resources/modules/org/jboss/as/cli/main/wildfly-cli-1.0.0.Alpha11-SNAPSHOT.jar
index c105089..7e9aac2 100644
Binary files a/distribution/modules/src/main/resources/modules/org/jboss/as/cli/main/wildfly-cli-1.0.0.Alpha11-SNAPSHOT.jar and b/distribution/modules/src/main/resources/modules/org/jboss/as/cli/main/wildfly-cli-1.0.0.Alpha11-SNAPSHOT.jar differ

diff --git a/docbook/reference/en/en-US/modules/server-installation.xml b/docbook/reference/en/en-US/modules/server-installation.xml
index e3c01b7..74e5411 100755
--- a/docbook/reference/en/en-US/modules/server-installation.xml
+++ b/docbook/reference/en/en-US/modules/server-installation.xml
@@ -790,8 +790,8 @@ keycloak-war-dist-all-&project.version;/
 </para>
             <warning>
                 <para>
-                    If you create more than one Keycloak server, you will need to use <ulink url="https://developer.jboss.org/wiki/AGUIForTheCommandLineInterface">CLI GUI</ulink>
-                    to fully configure each instance.  At the least, you will need to run the <link linkend="uploading-extra-config">update-server-config</link> operation.
+                    If you create more than one Keycloak server, you will need to use CLI to fully configure each instance.  At the least, 
+                    you will need to run the <link linkend="uploading-extra-config">update-server-config</link> operation.
                 </para>
             </warning>
         </section>
@@ -801,11 +801,11 @@ keycloak-war-dist-all-&project.version;/
                 Servers can also be added/removed or enabled/disabled at runtime using the <ulink url="https://developer.jboss.org/wiki/CommandLineInterface">CLI</ulink> or 
                 <ulink url="https://developer.jboss.org/wiki/AGUIForTheCommandLineInterface">CLI GUI</ulink> tool.  These are tools that ship with WildFly and also with
                 the Keycloak Appliance installation.  See <ulink url="https://developer.jboss.org/wiki/CommandLineInterface">CLI</ulink> or 
-                <ulink url="https://developer.jboss.org/wiki/AGUIForTheCommandLineInterface">CLI GUI</ulink> documentation to learn more about how to start the tools
-                and issue commands.
+                <ulink url="https://developer.jboss.org/wiki/AGUIForTheCommandLineInterface">CLI GUI</ulink> documentation to learn more about how to start the tools,
+                issue commands, and create CLI scripts.
             </para>
 <para>
-To start CLI GUI with the Keycloak Appliance install:
+To start CLI with the Keycloak Appliance install:
 <programlisting><![CDATA[
 cd <APPLIANCE_INSTALL_DIR>/keycloak/bin
 ./jboss-cli.sh --gui
@@ -839,11 +839,11 @@ The Keycloak server will be immediately deployed or undeployed, but not deleted.
 </para>
             </section>
             <section id="uploading-extra-config">
-                <title>Uploading extra configuration using CLI GUI</title>
+                <title>Uploading extra configuration using CLI</title>
                 <para>
                     The WildFly Keycloak subsystem allows you to upload keycloak-server.json, provider jars, and theme jars to a Keycloak server instance.  The
-                    CLI operations for this are "update-server-config" and "add-provider".  You must use
-                    <ulink url="https://developer.jboss.org/wiki/AGUIForTheCommandLineInterface">CLI GUI</ulink> for these operations.
+                    CLI operations for this are "update-server-config" and "add-provider".  You may use plain or CLI scripts for these operations.  The following
+                    examples are shown using <ulink url="https://developer.jboss.org/wiki/AGUIForTheCommandLineInterface">CLI GUI</ulink> for clarity.
                 </para>
                 <para>
                     To use a new keycloak-server.json file for your server, find your server under the Keycloak subsystem.  Then right-click the server,
@@ -885,6 +885,12 @@ The Keycloak server will be immediately deployed or undeployed, but not deleted.
             <para>
                 In the example below, a Keycloak server named "foo" is defined in the "full" profile.  The "full" profile is assigned to the "main-server-group".
                 Every WildFly instance that belongs to "main-server-group" will get an identically configured deployment of the "foo" Keycloak server.
+            </para>
+            <para>
+                All operations discussed earlier are valid for a Keycloak server in a domain.  You can enable/disable, upload new keyclaok-server.json, and add provider jars.
+                In the following example, any changes that are made to the "foo" server will be automatically propogated to every instance in "main-server-group".
+            </para>
+            <para>
                 <imagedata fileref="images/domain-mode.png"/>
             </para>
         </section>

diff --git a/pom.xml b/pom.xml
index 6318743..aa25901 100755
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
     <packaging>pom</packaging>
 
     <properties>
+        <aesh.version>0.33.12</aesh.version>
         <bouncycastle.version>1.46</bouncycastle.version>
         <jackson.version>1.9.9</jackson.version>
         <keycloak.apache.httpcomponents.version>4.2.1</keycloak.apache.httpcomponents.version>
@@ -143,6 +144,17 @@
                 <version>${javax.mail.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.jboss.aesh</groupId>
+                <artifactId>aesh</artifactId>
+                <version>${aesh.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>jaxrs-api</artifactId>
                 <version>${resteasy.version}</version>