keycloak-uncached

diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js
index aa61993..b7b113a 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/controllers/realm.js
@@ -117,6 +117,8 @@ module.controller('RealmCreateCtrl', function($scope, Current, Realm, $upload, $
 
     $scope.save = function() {
         var realmCopy = angular.copy($scope.realm);
+        var ssl = window.location.protocol == 'https:';
+        realmCopy.sslNotRequired = !ssl;
         console.log('creating new realm **');
         Realm.create(realmCopy, function(data, headers) {
             var data = Realm.query(function() {
@@ -438,6 +440,12 @@ module.controller('RealmDefaultRolesCtrl', function ($scope, Realm, realm, appli
     $scope.selectedRealmDefRoles = [];
 
     $scope.applications = angular.copy(applications);
+    for (var i = 0; i < applications.length; i++) {
+        if (applications[i].name == 'account') {
+            $scope.application = $scope.applications[i];
+            break;
+        }
+    }
 
     $scope.availableAppRoles = [];
     $scope.selectedAppRoles = [];

diff --git a/docbook/reference/en/en-US/modules/eap6-adapter.xml b/docbook/reference/en/en-US/modules/eap6-adapter.xml
index 88ec080..391a277 100755
--- a/docbook/reference/en/en-US/modules/eap6-adapter.xml
+++ b/docbook/reference/en/en-US/modules/eap6-adapter.xml
@@ -45,7 +45,20 @@
             the adapter's dependencies may conflict with your application's.
         </para>
         <para>
-            After creating the <literal>jboss-deployment-structure.xml</literal> configuration file, you must create
+            Next thing you have to do is turn on the Keycloak adapter for this deployment.  To do this you must
+            create a <literal>WEB-INF/jboss-web.xml</literal> file and specify a a Keycloak valve.  This will override
+            any <literal>login-config</literal> setting you have defined with <literal>web.xml</literal>
+        </para>
+        <para>
+<programlisting><![CDATA[<jboss-web>
+    <valve>
+        <class-name>org.keycloak.adapters.as7.KeycloakAuthenticatorValve</class-name>
+    </valve>
+</jboss-web>]]>
+</programlisting>
+        </para>
+        <para>
+            After creating the <literal>jboss-web.xml</literal> configuration file, you must create
             a <literal>keycloak.json</literal> adapter config file within the <literal>WEB-INF</literal> directory
             of your WAR.  The format of this config file is describe in the <link linkend='adapter-config'>general adapter configuration</link>
             section.

diff --git a/examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-web.xml b/examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-web.xml
index a28a265..42df73f 100755
--- a/examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-web.xml
@@ -1,5 +1,5 @@
 <jboss-web>
     <valve>
-        <class-name>org.keycloak.adapters.as7.OAuthAuthenticatorValve</class-name>
+        <class-name>org.keycloak.adapters.as7.KeycloakAuthenticatorValve</class-name>
     </valve>
 </jboss-web>
\ No newline at end of file

diff --git a/examples/demo-template/database-service/src/main/webapp/WEB-INF/jboss-web.xml b/examples/demo-template/database-service/src/main/webapp/WEB-INF/jboss-web.xml
index d1ca393..42df73f 100755
--- a/examples/demo-template/database-service/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/examples/demo-template/database-service/src/main/webapp/WEB-INF/jboss-web.xml
@@ -1,5 +1,5 @@
 <jboss-web>
     <valve>
-        <class-name>org.keycloak.adapters.as7.BearerTokenAuthenticatorValve</class-name>
+        <class-name>org.keycloak.adapters.as7.KeycloakAuthenticatorValve</class-name>
     </valve>
 </jboss-web>
\ No newline at end of file

diff --git a/examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-web.xml b/examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-web.xml
index a28a265..42df73f 100755
--- a/examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-web.xml
@@ -1,5 +1,5 @@
 <jboss-web>
     <valve>
-        <class-name>org.keycloak.adapters.as7.OAuthAuthenticatorValve</class-name>
+        <class-name>org.keycloak.adapters.as7.KeycloakAuthenticatorValve</class-name>
     </valve>
 </jboss-web>
\ No newline at end of file