Merge pull request #686 from mposolda/master

KEYCLOAK-674 Reduce info level logging in adapters
2014-09-10 16:04:48 +02:00 · 2014-09-10 16:02:22 +02:00 · 2014-09-10 13:16:21 +02:00 · 2014-09-10 13:05:53 +02:00 · 2014-09-10 10:52:33 +02:00 · 2014-09-10 10:42:05 +02:00
355 changed files with 3637 additions and 2819 deletions
@@ -1,2 +0,0 @@
-org.keycloak.audit.AuditProviderSpi
-org.keycloak.audit.AuditListenerSpi
@@ -1 +0,0 @@
-org.keycloak.audit.email.EmailAuditListenerFactory
@@ -1 +0,0 @@
-org.keycloak.audit.log.JBossLoggingAuditListenerFactory
@@ -1 +0,0 @@
-org.keycloak.audit.jpa.JpaAuditProviderFactory
@@ -1 +0,0 @@
-org.keycloak.audit.mongo.MongoAuditProviderFactory
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -25,7 +25,7 @@
        <class>org.keycloak.models.sessions.jpa.entities.UsernameLoginFailureEntity</class>

        <!-- JpaAuditProvider -->
-        <class>org.keycloak.audit.jpa.EventEntity</class>
+        <class>org.keycloak.events.jpa.EventEntity</class>

        <exclude-unlisted-classes>true</exclude-unlisted-classes>
        
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
    </parent>
    <name>Connections Parent</name>
    <description/>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -14,7 +14,7 @@ public class Version {
    public static String VERSION;
    public static String BUILD_TIME;
    public static final String UNKNOWN = "UNKNOWN";
-    public static final Version SINGLETON = new Version();
+    public static final Version SINGLETON;

    private final String version = VERSION;
    private final String buildTime = BUILD_TIME;
@@ -30,6 +30,8 @@ public class Version {
            VERSION=UNKNOWN;
            BUILD_TIME=UNKNOWN;
        }
+
+        SINGLETON = new Version();
    }

    @JsonProperty("version")
@@ -0,0 +1,47 @@
+package org.keycloak.representations;
+
+import org.keycloak.util.Time;
+
+/**
+ * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
+ */
+public class PasswordToken {
+
+    private String realm;
+    private String user;
+    private int timestamp;
+
+    public PasswordToken() {
+    }
+
+    public PasswordToken(String realm, String user) {
+        this.realm = realm;
+        this.user = user;
+        this.timestamp = Time.currentTime();
+    }
+
+    public String getRealm() {
+        return realm;
+    }
+
+    public void setRealm(String realm) {
+        this.realm = realm;
+    }
+
+    public String getUser() {
+        return user;
+    }
+
+    public void setUser(String user) {
+        this.user = user;
+    }
+
+    public int getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(int timestamp) {
+        this.timestamp = timestamp;
+    }
+
+}
@@ -7,6 +7,7 @@ package org.keycloak.representations.idm;
 public class CredentialRepresentation {
    public static final String SECRET = "secret";
    public static final String PASSWORD = "password";
+    public static final String PASSWORD_TOKEN = "password-token";
    public static final String TOTP = "totp";
    public static final String CLIENT_CERT = "cert";

@@ -1,37 +0,0 @@
-package org.keycloak.representations.idm;
-
-import java.util.List;
-
-/**
- * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class RealmAuditRepresentation {
-    protected boolean auditEnabled;
-    protected Long auditExpiration;
-    protected List<String> auditListeners;
-
-    public boolean isAuditEnabled() {
-        return auditEnabled;
-    }
-
-    public void setAuditEnabled(boolean auditEnabled) {
-        this.auditEnabled = auditEnabled;
-    }
-
-    public Long getAuditExpiration() {
-        return auditExpiration;
-    }
-
-    public void setAuditExpiration(Long auditExpiration) {
-        this.auditExpiration = auditExpiration;
-    }
-
-    public List<String> getAuditListeners() {
-        return auditListeners;
-    }
-
-    public void setAuditListeners(List<String> auditListeners) {
-        this.auditListeners = auditListeners;
-    }
-}
@@ -0,0 +1,37 @@
+package org.keycloak.representations.idm;
+
+import java.util.List;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class RealmEventsConfigRepresentation {
+    protected boolean eventsEnabled;
+    protected Long eventsExpiration;
+    protected List<String> eventsListeners;
+
+    public boolean isEventsEnabled() {
+        return eventsEnabled;
+    }
+
+    public void setEventsEnabled(boolean eventsEnabled) {
+        this.eventsEnabled = eventsEnabled;
+    }
+
+    public Long getEventsExpiration() {
+        return eventsExpiration;
+    }
+
+    public void setEventsExpiration(Long eventsExpiration) {
+        this.eventsExpiration = eventsExpiration;
+    }
+
+    public List<String> getEventsListeners() {
+        return eventsListeners;
+    }
+
+    public void setEventsListeners(List<String> eventsListeners) {
+        this.eventsListeners = eventsListeners;
+    }
+}
@@ -60,9 +60,9 @@ public class RealmRepresentation {
    protected String accountTheme;
    protected String adminTheme;
    protected String emailTheme;
-    protected boolean auditEnabled;
-    protected long auditExpiration;
-    protected List<String> auditListeners;
+    protected boolean eventsEnabled;
+    protected long eventsExpiration;
+    protected List<String> eventsListeners;

    public String getId() {
        return id;
@@ -436,28 +436,28 @@ public class RealmRepresentation {
        this.failureFactor = failureFactor;
    }

-    public boolean isAuditEnabled() {
-        return auditEnabled;
+    public boolean isEventsEnabled() {
+        return eventsEnabled;
    }

-    public void setAuditEnabled(boolean auditEnabled) {
-        this.auditEnabled = auditEnabled;
+    public void setEventsEnabled(boolean eventsEnabled) {
+        this.eventsEnabled = eventsEnabled;
    }

-    public long getAuditExpiration() {
-        return auditExpiration;
+    public long getEventsExpiration() {
+        return eventsExpiration;
    }

-    public void setAuditExpiration(long auditExpiration) {
-        this.auditExpiration = auditExpiration;
+    public void setEventsExpiration(long eventsExpiration) {
+        this.eventsExpiration = eventsExpiration;
    }

-    public List<String> getAuditListeners() {
-        return auditListeners;
+    public List<String> getEventsListeners() {
+        return eventsListeners;
    }

-    public void setAuditListeners(List<String> auditListeners) {
-        this.auditListeners = auditListeners;
+    public void setEventsListeners(List<String> eventsListeners) {
+        this.eventsListeners = eventsListeners;
    }

    public List<UserFederationProviderRepresentation> getUserFederationProviders() {
@@ -0,0 +1,19 @@
+package org.keycloak.util;
+
+import java.net.URI;
+
+/**
+ * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
+ */
+public class UriUtils {
+
+    public static String getOrigin(URI uri) {
+        return getOrigin(uri.toString());
+    }
+
+    public static String getOrigin(String uri) {
+        String u = uri.toString();
+        return u.substring(0, u.indexOf('/', 8));
+    }
+
+}
@@ -206,7 +206,6 @@ public class RSAVerifierTest {
            v = verifySkeletonKeyToken(encoded);
            Assert.fail();
        } catch (VerificationException ignored) {
-            System.out.println(ignored.getMessage());
        }
    }

@@ -225,7 +224,6 @@ public class RSAVerifierTest {
        try {
            v = verifySkeletonKeyToken(encoded);
        } catch (VerificationException ignored) {
-            System.out.println(ignored.getMessage());
        }
    }

@@ -24,8 +24,6 @@ public class SkeletonKeyTokenTest {
        token.addAccess("bar").addRole("user");

        String json = JsonSerialization.writeValueAsString(token);
-        System.out.println(json);
-
        token = JsonSerialization.readValue(json, AccessToken.class);
        Assert.assertEquals("111", token.getId());
        AccessToken.Access foo = token.getResourceAccess("foo");
@@ -47,8 +45,6 @@ public class SkeletonKeyTokenTest {
                .jsonContent(token)
                .rsa256(keyPair.getPrivate());

-        System.out.println(encoded);
-
        JWSInput input = new JWSInput(encoded);

        token = input.readJsonContent(AccessToken.class);
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.0-rc-1</version>
+		<version>1.0-final</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -48,17 +48,17 @@
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-audit-jpa</artifactId>
+            <artifactId>keycloak-events-jpa</artifactId>
            <version>${project.version}</version>
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-audit-jboss-logging</artifactId>
+            <artifactId>keycloak-events-jboss-logging</artifactId>
            <version>${project.version}</version>
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-audit-email</artifactId>
+            <artifactId>keycloak-events-email</artifactId>
            <version>${project.version}</version>
        </dependency>

@@ -136,7 +136,7 @@
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-audit-mongo</artifactId>
+            <artifactId>keycloak-events-mongo</artifactId>
            <version>${project.version}</version>
        </dependency>
        <dependency>
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.0-rc-1</version>
+		<version>1.0-final</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -50,17 +50,17 @@
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-audit-api</artifactId>
+            <artifactId>keycloak-events-api</artifactId>
            <version>${project.version}</version>
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-audit-jpa</artifactId>
+            <artifactId>keycloak-events-jpa</artifactId>
            <version>${project.version}</version>
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-audit-jboss-logging</artifactId>
+            <artifactId>keycloak-events-jboss-logging</artifactId>
            <version>${project.version}</version>
        </dependency>
        <dependency>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -88,6 +88,7 @@
                                    <artifactId>keycloak-js-adapter</artifactId>
                                    <version>${project.version}</version>
                                    <outputDirectory>${project.build.directory}/unpacked/js-adapter</outputDirectory>
+                                    <includes>*.js</includes>                                    
                                </artifactItem>
                            </artifactItems>
                            <excludes>**/welcome-content/*</excludes>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -8,7 +8,6 @@
                <exclude name="**/*.iml"/>
                <exclude name="**/*.unconfigured"/>
                <exclude name="**/subsystem-config.xml"/>
-                <exclude name="**/README.md.overview"/>
            </fileset>
        </copy>
        <copy todir="target/examples/cordova" overwrite="true">
@@ -17,7 +16,6 @@
                <exclude name="**/*.iml"/>
                <exclude name="**/*.unconfigured"/>
                <exclude name="**/subsystem-config.xml"/>
-                <exclude name="**/README.md.overview"/>
            </fileset>
        </copy>
        <copy todir="target/examples/providers" overwrite="true">
@@ -26,7 +24,6 @@
                <exclude name="**/*.iml"/>
                <exclude name="**/*.unconfigured"/>
                <exclude name="**/subsystem-config.xml"/>
-                <exclude name="**/README.md.overview"/>
            </fileset>
        </copy>
        <copy todir="target/examples/js-console" overwrite="true">
@@ -35,7 +32,6 @@
                <exclude name="**/*.iml"/>
                <exclude name="**/*.unconfigured"/>
                <exclude name="**/subsystem-config.xml"/>
-                <exclude name="**/README.md.overview"/>
            </fileset>
        </copy>
        <copy todir="target/examples/themes" overwrite="true">
@@ -44,7 +40,6 @@
                <exclude name="**/*.iml"/>
                <exclude name="**/*.unconfigured"/>
                <exclude name="**/subsystem-config.xml"/>
-                <exclude name="**/README.md.overview"/>
            </fileset>
        </copy>
        <copy todir="target/examples/preconfigured-demo" overwrite="true">
@@ -53,7 +48,6 @@
                <exclude name="**/*.iml"/>
                <exclude name="**/*.unconfigured"/>
                <exclude name="**/subsystem-config.xml"/>
-                <exclude name="**/README.md.overview"/>
            </fileset>
        </copy>
        <copy todir="target/examples/unconfigured-demo" overwrite="true">
@@ -65,10 +59,9 @@
                <exclude name="**/target/**"/>
                <exclude name="**/*.iml"/>
                <exclude name="**/README.md"/>
-                <exclude name="**/README.md.overview"/>
            </fileset>
        </copy>
-        <copy file="../../examples/demo-template/README.md.overview" tofile="target/examples/README.md"/>
+        <copy file="../../examples/README.md" tofile="target/examples/README.md"/>
        <move file="target/examples/unconfigured-demo/README.md.unconfigured" tofile="target/examples/unconfigured-demo/README.md"/>
        <move file="target/examples/unconfigured-demo/customer-app/src/main/webapp/WEB-INF/web.xml.unconfigured" tofile="target/examples/unconfigured-demo/customer-app/src/main/webapp/WEB-INF/web.xml"/>
        <move file="target/examples/unconfigured-demo/product-app/src/main/webapp/WEB-INF/web.xml.unconfigured" tofile="target/examples/unconfigured-demo/product-app/src/main/webapp/WEB-INF/web.xml"/>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -30,7 +30,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>Distribution</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -89,6 +89,7 @@
                                    <artifactId>keycloak-js-adapter</artifactId>
                                    <version>${project.version}</version>
                                    <outputDirectory>${project.build.directory}/unpacked/js-adapter</outputDirectory>
+                                    <includes>*.js</includes>                                    
                                </artifactItem>
                            </artifactItems>
                        </configuration>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -1,15 +1,19 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>keycloak-parent</artifactId>
+        <groupId>org.keycloak</groupId>
+        <version>1.0-final</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>

-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.keycloak</groupId>
    <artifactId>keycloak-reference-guide-${translation}</artifactId>
-    <version>1.0-rc-1</version>
    <packaging>jdocbook</packaging>
    <name>Keycloak Reference Guide (${translation})</name>
    <description/>
+    <modelVersion>4.0.0</modelVersion>
+
    <repositories>
        <repository>
            <id>jboss</id>
@@ -26,7 +26,7 @@
                <!ENTITY DirectAccess SYSTEM "modules/direct-access.xml">
                <!ENTITY CORS SYSTEM "modules/cors.xml">
                <!ENTITY Timeouts SYSTEM "modules/timeouts.xml">
-                <!ENTITY Audit SYSTEM "modules/audit.xml">
+                <!ENTITY Events SYSTEM "modules/events.xml">
                <!ENTITY AdminApi SYSTEM "modules/admin-rest-api.xml">
                <!ENTITY UserFederation SYSTEM "modules/user-federation.xml">
                <!ENTITY ExportImport SYSTEM "modules/export-import.xml">
@@ -38,7 +38,7 @@
   <bookinfo>
      <title>Keycloak Reference Guide</title>
      <subtitle>SSO for Web Apps and REST Services</subtitle>
-      <releaseinfo>1.0-rc-1</releaseinfo>
+      <releaseinfo>&project.version;</releaseinfo>
   </bookinfo>

   <toc/>
@@ -115,7 +115,7 @@ This one is short
    &CORS;
    &Timeouts;
    &AdminApi;
-    &Audit;
+    &Events;
    &UserFederation;
    &ExportImport;
    &ServerCache;
@@ -1,5 +1,12 @@
 <chapter id="Migration_from_older_versions">
    <title>Migration from older versions</title>
+    <sect1>
+        <title>Migrating from 1.0 RC-1 to RC-2</title>
+        <itemizedlist>
+            <listitem>A lot of info level logging has been changed to debug. Also, a realm no longer has the jboss-logging audit listener by default.
+            If you want log output when users login, logout, change passwords, etc. enable the jboss-logging audit listener through the admin console.</listitem>
+         </itemizedlist>
+    </sect1>
    <sect1>
        <title>Migrating from 1.0 Beta 4 to RC-1</title>
        <itemizedlist>
@@ -152,7 +152,7 @@
                of roles that an application or oauth client is allowed to ask permission for.  Access tokens are always
                granted at the request of a specific application or oauth client.  This also holds true for SSO.  As you visit
                different sites, the application will redirect back to the Keycloak Server via the OAuth 2.0 protocol to obtain an access
-                token specific to that application.  The role mappings contained within the token are the union
+                token specific to that application.  The role mappings contained within the token are the intersection
                between the set of user role mappings and the permission scope of the application/oauth client.  So,
                access tokens are tailor made for each application/oauth client and contain only the information required
                for by them.
@@ -11,7 +11,7 @@
  "realm-public-key" : "MIGfMA0GCSqGSIb3D...31LwIDAQAB",
  "auth-server-url" : "https://localhost:8443/auth",
  "ssl-required" : "external",
-  "user-resource-role-mappings" : false,
+  "use-resource-role-mappings" : false,
  "enable-cors" : true,
  "cors-max-age" : 1000,
  "cors-allowed-methods" : [ "POST", "PUT", "DELETE", "GET" ],
@@ -101,7 +101,7 @@
                </listitem>
            </varlistentry>
            <varlistentry>
-                <term>user-resource-role-mappings</term>
+                <term>use-resource-role-mappings</term>
                <listitem>
                    <para>
                        If set to true, the adapter will look inside the token for application level role mappings for
@@ -1,13 +1,13 @@
-<chapter id="audit">
-    <title>Audit</title>
+<chapter id="events">
+    <title>Events</title>
    <para>
-        Keycloak provides an Audit SPI that makes it possible to register listeners for events in the system. There are two
-        interfaces that can be implemented, the first is a pure listener, the second is a provider which listens for events
-        as well as providing a query over persisted events. If a realm has a audit provider registered it's possible to
-        view events for the realm through the admin console and account management.
+        Keycloak provides an Events SPI that makes it possible to register listeners for user related events, for example
+        user logins. There are two interfaces that can be implemented, the first is a pure listener, the second is a events
+        store which listens for events, but is also required to store events. An events store provides a way for the admin
+        and account management consoles to view events.
    </para>
    <section>
-        <title>Events</title>
+        <title>Event types</title>
        <para>
            Login events:
            <itemizedlist>
@@ -19,7 +19,7 @@
            </itemizedlist>
        </para>
        <para>
-            Account events
+            Account events:
            <itemizedlist>
                <listitem>Social Link - An account has been linked to a social provider</listitem>
                <listitem>Remove Social Link - A social provider has been removed from an account</listitem>
@@ -38,14 +38,14 @@
        </para>
    </section>
    <section>
-        <title>Audit Listener</title>
+        <title>Event Listener</title>
        <para>
-            Keycloak comes with an Email Audit Listener and a JBogg Logging Audit Listener. The Email Audit Listener
-            sends an email to the users account when an event occurs. The JBoss Logging Audit Listener writes to a log
+            Keycloak comes with an Email Event Listener and a JBogg Logging Event Listener. The Email Event Listener
+            sends an email to the users account when an event occurs. The JBoss Logging Event Listener writes to a log
            file when an events occurs.
        </para>
        <para>
-            The Email Audit Listener only supports the following events at the moment:
+            The Email Event Listener only supports the following events at the moment:
            <itemizedlist>
                <listitem>Login Error</listitem>
                <listitem>Update Password</listitem>
@@ -55,7 +55,7 @@
            You can exclude one or more events by editing <literal>standalone/configuration/keycloak-server.json</literal>
            and adding for example:
 <programlisting><![CDATA[
-"audit-listener": {
+"eventListener": {
    "email": {
        "exclude-events": [ "UPDATE_TOTP", "REMOVE_TOTP" ]
    }
@@ -65,18 +65,17 @@
    </section>

    <section>
-        <title>Audit Provider</title>
+        <title>Event Store</title>
        <para>
-            Audit Providers listen for events and is expected to persist the events to make it possible to query for them
+            Event Store listen for events and is expected to persist the events to make it possible to query for them
            later. This is used by the admin console and account management to view events. Keycloak includes providers
-            to persist audit events to JPA and Mongo. For production you will most likely want to use a separate database
-            for audit events. You may even want to use a RDBMS for your model, and Mongo for your audit.
+            to persist events to JPA and Mongo.
        </para>
        <para>
            You can specify events to include or exclude by editing <literal>standalone/configuration/keycloak-server.json</literal>,
        and adding for example:
 <programlisting><![CDATA[
-"audit": {
+"eventsStore": {
    "jpa": {
        "exclude-events": [ "LOGIN", "REFRESH_TOKEN", "CODE_TO_TOKEN" ]
    }
@@ -86,18 +85,18 @@
    </section>

    <section>
-        <title>Configure Audit Settings for Realm</title>
+        <title>Configure Events Settings for Realm</title>
        <para>
-            To enable audit for a realm you firstly need to make sure you have a audit provider registered for Keycloak.
-            By default the JPA audit provider is registered. Once you've done that open the admin console, select the
-            realm you're configuring, select <literal>Audit</literal>. Then click on <literal>Config</literal>.
-            You can enable audit for your realm by toggling <literal>Enabled</literal> to ON. You can also set
-            an expiration on audit events. This will deleted events from the database that are older than the specified
+            To enable persisting of events for a realm you first need to make sure you have a event store provider registered for Keycloak.
+            By default the JPA event store provider is registered. Once you've done that open the admin console, select the
+            realm you're configuring, select <literal>Events</literal>. Then click on <literal>Config</literal>.
+            You can enable storing events for your realm by toggling <literal>Save Events</literal> to ON. You can also set
+            an expiration on events. This will periodically delete events from the database that are older than the specified
            time.
        </para>
        <para>
-            To configure listeners for a realm on the same page as above add one or more audit listeners to the <literal>
-            Audit Listeners</literal> select box. This will allow you to enable any registered Audit Listeners with the
+            To configure listeners for a realm on the same page as above add one or more event listeners to the
+            <literal>Listeners</literal> select box. This will allow you to enable any registered event listeners with the
            realm.
        </para>
    </section>
@@ -8,11 +8,11 @@
        <itemizedlist>

            <listitem>
-                keycloak-appliance-dist-all-1.0-rc-1.zip
+                keycloak-appliance-dist-all-&project.version;.zip
            </listitem>

            <listitem>
-                keycloak-war-dist-all-1.0-rc-1.zip
+                keycloak-war-dist-all-&project.version;.zip
            </listitem>

        </itemizedlist>
@@ -22,7 +22,7 @@
        <title>Appliance Install</title>
        <para>
            The
-            <literal>keycloak-appliance-dist-all.zip</literal>
+            <literal>keycloak-appliance-dist-all-&project.version;.zip</literal>
            is quite large, but contains a complete server (backed by Wildfly)
            that runs out of the box. The only thing you'll have to enable and configure is SSL. Unzipping it, the
            directory layout looks
@@ -31,7 +31,7 @@

        <para>
 <programlisting>
-keycloak-appliance-dist-all-1.0-rc-1/
+keycloak-appliance-dist-all-&project.version;/
    keycloak/
        bin/
            standalone.sh
@@ -42,9 +42,9 @@ keycloak-appliance-dist-all-1.0-rc-1/
                keycloak-server.json
                themes/
    adapters/
-        keycloak-as7-adapter-dist-1.0-rc-1.zip
-        keycloak-eap6-adapter-dist-1.0-rc-1.zip
-        keycloak-wildfly-adapter-dist-1.0-rc-1.zip
+        keycloak-as7-adapter-dist-&project.version;.zip
+        keycloak-eap6-adapter-dist-&project.version;.zip
+        keycloak-wildfly-adapter-dist-&project.version;.zip
    examples/
    docs/
 </programlisting>
@@ -67,7 +67,7 @@ keycloak-appliance-dist-all-1.0-rc-1/
        <title>WAR Distribution Installation</title>
        <para>
            The
-            <literal>keycloak-war-dist-all.zip</literal>
+            <literal>keycloak-war-dist-all-&project.version;.zip</literal>
            contains
            just the bits you need to install keycloak on your favorite web container. We currently only support
            installing it on top of an existing JBoss AS 7.1.1, JBoss EAP 6.x, or Wildfly 8 distribution. We may in the
@@ -79,7 +79,7 @@ keycloak-appliance-dist-all-1.0-rc-1/
        </para>
        <para>
 <programlisting>
-keycloak-war-dist-all-1.0-rc-1/
+keycloak-war-dist-all-&project.version;/
    deployments/
        auth-server.war/
        keycloak-ds.xml
@@ -87,9 +87,9 @@ keycloak-war-dist-all-1.0-rc-1/
        keycloak-server.json
        themes/
    adapters/
-        keycloak-as7-adapter-dist-1.0-rc-1.zip
-        keycloak-eap6-adapter-dist-1.0-rc-1.zip
-        keycloak-wildfly-adapter-dist-1.0-rc-1.zip
+        keycloak-as7-adapter-dist-&project.version;.zip
+        keycloak-eap6-adapter-dist-&project.version;.zip
+        keycloak-wildfly-adapter-dist-&project.version;.zip
    examples/
    docs/
 </programlisting>
@@ -101,7 +101,7 @@ keycloak-war-dist-all-1.0-rc-1/
        </para>
        <para>
 <programlisting>
-    $ cd keycloak-war-dist-all-1.0-rc-1
+    $ cd keycloak-war-dist-all-&project.version;
    $ cp -r deployments $JBOSS_HOME/standalone
    $ cp -r configuration $JBOSS_HOME/standalone
 </programlisting>
@@ -129,7 +129,7 @@ keycloak-war-dist-all-1.0-rc-1/
            <itemizedlist>

                <listitem>
-                    Configuring keycloak to use a production database.
+                    Configuring Keycloak to use a production database.
                </listitem>

                <listitem>
@@ -144,14 +144,14 @@ keycloak-war-dist-all-1.0-rc-1/
        <section>
            <title>Relational Database Configuration</title>
            <para>
-                By default, Keycloak uses a relational database to store Keycloak data.  This datasource is the <literal>.../standalone/deployments/keycloak-ds.xml</literal>
-                file of your Keycloak Server installation if you used <xref linkend="WAR_distribution_installation" /> or in <literal>.../standalone/configuration/standalone.xml</literal>
+                By default, Keycloak uses a relational database to store Keycloak data.  This datasource is the <literal>standalone/deployments/keycloak-ds.xml</literal>
+                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:
+                <literal>standalone/configuration/standalone.xml</literal> should look like after you've done this:
            </para>
            <para>
 <programlisting><![CDATA[
@@ -180,8 +180,8 @@ keycloak-war-dist-all-1.0-rc-1/
            <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
         </driver>
      </drivers>
-            </datasources>
-        </subsystem>
+   </datasources>
+</subsystem>
 ]]>
 </programlisting>
            </para>
@@ -206,16 +206,6 @@ keycloak-war-dist-all-1.0-rc-1/
 ]]></programlisting>
                Possible configuration options are:
                <variablelist>
-                    <varlistentry>
-                        <term>unitName</term>
-                        <listitem>
-                            <para>
-                                Allow you to specify name of persistence unit if you want to provide your own persistence.xml file for JPA configuration.
-                                If this option is used, then all other configuration options are ignored as you are expected to configure
-                                all JPA/DB properties in your own persistence.xml file. Hence you can remove properties "dataSource" and "databaseSchema" in this case.
-                            </para>
-                        </listitem>
-                    </varlistentry>
                    <varlistentry>
                        <term>dataSource</term>
                        <listitem>
@@ -265,6 +255,16 @@ keycloak-war-dist-all-1.0-rc-1/
                            </para>
                        </listitem>
                    </varlistentry>
+                    <varlistentry>
+                        <term>unitName</term>
+                        <listitem>
+                            <para>
+                                Allow you to specify name of persistence unit if you want to provide your own persistence.xml file for JPA configuration.
+                                If this option is used, then all other configuration options are ignored as you are expected to configure
+                                all JPA/DB properties in your own persistence.xml file. Hence you can remove properties "dataSource" and "databaseSchema" in this case.
+                            </para>
+                        </listitem>
+                    </varlistentry>
                </variablelist>
                For more info about Hibernate properties, see <ulink url="http://hibernate.org/orm/documentation/">Hibernate and JPA documentation</ulink> .
            </para>
@@ -329,7 +329,7 @@ keycloak-war-dist-all-1.0-rc-1/
                in your favourite editor, then change:

 <programlisting><![CDATA[
-"audit": {
+"eventsStore": {
    "provider": "jpa",
    "jpa": {
        "exclude-events": [ "REFRESH_TOKEN" ]
@@ -348,8 +348,11 @@ keycloak-war-dist-all-1.0-rc-1/
                to:

                <programlisting><![CDATA[
-"audit": {
+"eventsStore": {
    "provider": "mongo",
+    "mongo": {
+        "exclude-events": [ "REFRESH_TOKEN" ]
+    }
 },

 "realm": {
@@ -358,7 +361,7 @@ keycloak-war-dist-all-1.0-rc-1/

 "user": {
    "provider": "mongo"
-}
+},
 ]]></programlisting>

                And at the end of the file add the snippet like this where you can configure details about your Mongo database:
@@ -668,17 +671,6 @@ keycloak-war-dist-all-1.0-rc-1/
 </web-app>]]></programlisting>
                </para>
            </section>
-
-            <section>
-                <title>Enforce HTTPS at Realm Level</title>
-                <para>
-                    In Keycloak, each realm has an "Require SSL" switch that you should turn on.  Log into the
-                    adminstration console and set this switch for each realm that Keycloak manages.  This switch is on
-                    the <literal>Settings>>General</literal> page.  While this switch does do similar checks as the security
-                    constraint in <literal>web.xml</literal>, it will also force applications and oauth clients to only
-                    register HTTPS based redirect URLs.
-                </para>
-            </section>
        </section>

    </section>
@@ -22,6 +22,13 @@
                the list and the status should be <literal>ON</literal>).
            </para>
        </listitem>
+        <listitem>
+            <para>
+                Now click on the <literal>Consent screen</literal> link on the sidebar menu on the left.  You must specify
+                a project name and choose an email for the consent screen.  Otherwise users will get a login error.  There's
+                other things you can configure here like what the consent screen looks like.  Feel free to play around with this.
+            </para>
+        </listitem>
        <listitem>
            <para>
                Now click <literal>Credentials</literal> in the sidebar on the left. Then click
@@ -40,9 +47,4 @@
            </para>
        </listitem>
    </orderedlist>
-    <para>
-        You may also want to configure how the Google Consent Screen looks when users log in to your application via
-        Google. To do this go to <ulink url="https://cloud.google.com/console/project">Google Developer Console</ulink>
-        and click on <literal>Consent Screen</literal> in the sidebar to the left.
-    </para>
 </section>
@@ -10,9 +10,7 @@
        <title>Configure theme</title>
        <para>
            To configure the theme used by a realm open the <literal>Keycloak Admin Console</literal>, select your realm
-            from the drop-down box in the top left corner. In the <literal>Optional Settings</literal> use the drop-down
-            boxes for <literal>Login Theme</literal> and <literal>Account Theme</literal> to select the theme used
-            by login forms and account management pages.
+            from the drop-down box in the top left corner. Under <literal>Settings</literal> click on <literal>Theme</literal>.
        </para>
    </section>

@@ -56,7 +54,7 @@
            templates.
        </para>
        <para>
-            To create a new theme, create a folder in <literal>.../standalone/configuration/themes/&lt; theme type&gt;</literal>.
+            To create a new theme, create a folder in <literal>.../standalone/configuration/themes/&lt;theme type&gt;</literal>.
            The name of the folder is the name of the theme. Then create a file <literal>theme.properties</literal> inside the theme folder.
            The contents of the file should be:
        </para>
@@ -79,6 +77,7 @@
            <programlisting>styles=css/styles.css css/more-styles.css</programlisting>
        </section>
        <section>
+            <title>Scripts</title>
            <para>
                A theme can have one or more scripts, to add a script create a file inside <literal>resources/js</literal> (for example <literal>resources/js/script.js</literal>)
                inside your theme folder. Then registering it in <literal>theme.properties</literal> by adding:
@@ -154,7 +153,7 @@
            </para>
            <para>
                Keycloaks default account management provider is built on the FreeMarker template engine (<literal>forms/account-freemarker</literal>).
-                To make sure your provider is loaded you will either need to delete <literal>standalone/deployments/auth-server.war/WEB-INF/lib/keycloak-account-freemarker-1.0-rc-1.jar</literal>
+                To make sure your provider is loaded you will either need to delete <literal>standalone/deployments/auth-server.war/WEB-INF/lib/keycloak-account-freemarker-&project.version;.jar</literal>
                or disable it with the system property <literal>org.keycloak.account.freemarker.FreeMarkerAccountProviderFactory</literal>.
            </para>
        </section>
@@ -167,7 +166,7 @@
            </para>
            <para>
                Keycloaks default login forms provider is built on the FreeMarker template engine (<literal>forms/login-freemarker</literal>).
-                To make sure your provider is loaded you will either need to delete <literal>standalone/deployments/auth-server.war/WEB-INF/lib/keycloak-login-freemarker-1.0-rc-1.jar</literal>
+                To make sure your provider is loaded you will either need to delete <literal>standalone/deployments/auth-server.war/WEB-INF/lib/keycloak-login-freemarker-&project.version;.jar</literal>
                or disable it with the system property <literal>org.keycloak.login.freemarker.FreeMarkerLoginFormsProviderFactory</literal>.
            </para>
        </section>
@@ -101,7 +101,8 @@
                        <term>Other options</term>
                        <listitem>
                            <para>
-                                The rest of the configuration options should be self explanatory.
+                                The rest of the configuration options should be self explanatory. You can use tooltips in admin console
+                                to see some more details about them.
                            </para>
                        </listitem>
                    </varlistentry>
@@ -109,6 +110,46 @@
            </para>
        </section>
    </section>
+    <section>
+        <title>Sync of LDAP users to Keycloak</title>
+        <para>
+            LDAP Federation Provider will automatically take care of synchronization (import) of needed LDAP users into Keycloak database.
+            For example once you first authenticate LDAP user <literal>john</literal> from Keycloak UI, LDAP Federation provider will
+            first import this LDAP user into Keycloak database and then authenticate against LDAP password.
+        </para>
+        <para>
+            Thing is that Federation Provider import just requested users by default, so if you click to <literal>View all users</literal>
+            in Keycloak admin console, you will see just those LDAP users, which were already authenticated/requested by Keycloak.
+        </para>
+        <para>If you want to sync all LDAP users into Keycloak database, you may configure and enable Sync, which is in
+            admin console on same page like the configuration of Federation provider itself. There are 2 types of sync:
+            <variablelist>
+                <varlistentry>
+                    <term>Full sync</term>
+                    <listitem>
+                        <para>
+                            This will synchronize all LDAP users into Keycloak DB. Those LDAP users, which already exist in Keycloak and were
+                            changed in LDAP directly will be updated in Keycloak DB (For example if user <literal>Mary Kelly</literal> was changed in LDAP to <literal>Mary Doe</literal>).
+                        </para>
+                    </listitem>
+                </varlistentry>
+                <varlistentry>
+                    <term>Changed users sync</term>
+                    <listitem>
+                        <para>
+                            This will check LDAP and it will sync into Keycloak just those users, which were created or updated in LDAP from the time of last sync.
+                        </para>
+                    </listitem>
+                </varlistentry>
+            </variablelist>
+        </para>
+        <para>
+            In usual cases you may want to trigger full sync at the beginning, so you will import all LDAP users to Keycloak just once. Then you may setup
+            periodic sync of changed users, so Keycloak will periodically ask LDAP server for newly created or updated users and backport them to Keycloak DB.
+            Also you may want to trigger full sync again after some longer time or setup periodic full sync as well.
+        </para>
+        <para>In admin console, you can trigger sync directly or you can enable periodic changed or full sync.</para>
+    </section>
    <section>
        <title>Writing your own User Federation Provider</title>
        <para>
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <project>
    <parent>
-        <artifactId>keycloak-audit-parent</artifactId>
+        <artifactId>keycloak-events-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>

-    <artifactId>keycloak-audit-api</artifactId>
-    <name>Keycloak Audit API</name>
+    <artifactId>keycloak-events-api</artifactId>
+    <name>Keycloak Events API</name>
    <description/>

    <dependencies>
@@ -1,4 +1,4 @@
-package org.keycloak.audit;
+package org.keycloak.events;

 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
@@ -1,4 +1,4 @@
-package org.keycloak.audit;
+package org.keycloak.events;

 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
@@ -19,6 +19,7 @@ public interface Errors {

    String USERNAME_MISSING = "username_missing";
    String USERNAME_IN_USE = "username_in_use";
+    String EMAIL_IN_USE = "email_in_use";

    String INVALID_REDIRECT_URI = "invalid_redirect_uri";
    String INVALID_CODE = "invalid_code";
@@ -1,4 +1,4 @@
-package org.keycloak.audit;
+package org.keycloak.events;

 import java.util.HashMap;
 import java.util.Map;
@@ -10,7 +10,7 @@ public class Event {

    private long time;

-    private EventType event;
+    private EventType type;

    private String realmId;

@@ -34,12 +34,12 @@ public class Event {
        this.time = time;
    }

-    public EventType getEvent() {
-        return event;
+    public EventType getType() {
+        return type;
    }

-    public void setEvent(EventType event) {
-        this.event = event;
+    public void setType(EventType type) {
+        this.type = type;
    }

    public String getRealmId() {
@@ -101,7 +101,7 @@ public class Event {
    public Event clone() {
        Event clone = new Event();
        clone.time = time;
-        clone.event = event;
+        clone.type = type;
        clone.realmId = realmId;
        clone.clientId = clientId;
        clone.userId = userId;
@@ -1,4 +1,4 @@
-package org.keycloak.audit;
+package org.keycloak.events;

 import org.jboss.logging.Logger;
 import org.keycloak.models.ClientModel;
@@ -12,14 +12,14 @@ import java.util.List;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class Audit {
+public class EventBuilder {

-    private static final Logger log = Logger.getLogger(Audit.class);
+    private static final Logger log = Logger.getLogger(EventBuilder.class);

-    private List<AuditListener> listeners;
+    private List<EventListenerProvider> listeners;
    private Event event;

-    public Audit(List<AuditListener> listeners, RealmModel realm, String ipAddress) {
+    public EventBuilder(List<EventListenerProvider> listeners, RealmModel realm, String ipAddress) {
        this.listeners = listeners;
        this.event = new Event();

@@ -27,60 +27,60 @@ public class Audit {
        ipAddress(ipAddress);
    }

-    Audit() {
+    EventBuilder() {
    }

-    public Audit realm(RealmModel realm) {
+    public EventBuilder realm(RealmModel realm) {
        event.setRealmId(realm.getId());
        return this;
    }

-    public Audit realm(String realmId) {
+    public EventBuilder realm(String realmId) {
        event.setRealmId(realmId);
        return this;
    }

-    public Audit client(ClientModel client) {
+    public EventBuilder client(ClientModel client) {
        event.setClientId(client.getClientId());
        return this;
    }

-    public Audit client(String clientId) {
+    public EventBuilder client(String clientId) {
        event.setClientId(clientId);
        return this;
    }

-    public Audit user(UserModel user) {
+    public EventBuilder user(UserModel user) {
        event.setUserId(user.getId());
        return this;
    }

-    public Audit user(String userId) {
+    public EventBuilder user(String userId) {
        event.setUserId(userId);
        return this;
    }

-    public Audit session(UserSessionModel session) {
+    public EventBuilder session(UserSessionModel session) {
        event.setSessionId(session.getId());
        return this;
    }

-    public Audit session(String sessionId) {
+    public EventBuilder session(String sessionId) {
        event.setSessionId(sessionId);
        return this;
    }

-    public Audit ipAddress(String ipAddress) {
+    public EventBuilder ipAddress(String ipAddress) {
        event.setIpAddress(ipAddress);
        return this;
    }

-    public Audit event(EventType e) {
-        event.setEvent(e);
+    public EventBuilder event(EventType e) {
+        event.setType(e);
        return this;
    }

-    public Audit detail(String key, String value) {
+    public EventBuilder detail(String key, String value) {
        if (value == null || value.equals("")) {
            return this;
        }
@@ -92,7 +92,7 @@ public class Audit {
        return this;
    }

-    public Audit removeDetail(String key) {
+    public EventBuilder removeDetail(String key) {
        if (event.getDetails() != null) {
            event.getDetails().remove(key);
        }
@@ -108,19 +108,19 @@ public class Audit {
    }

    public void error(String error) {
-        event.setEvent(EventType.valueOf(event.getEvent().name() + "_ERROR"));
+        event.setType(EventType.valueOf(event.getType().name() + "_ERROR"));
        event.setError(error);
        send();
    }

-    public Audit clone() {
-        Audit clone = new Audit();
+    public EventBuilder clone() {
+        EventBuilder clone = new EventBuilder();
        clone.listeners = listeners;
        clone.event = event.clone();
        return clone;
    }

-    public Audit reset() {
+    public EventBuilder reset() {
        Event old = event;

        event = new Event();
@@ -136,11 +136,11 @@ public class Audit {
        event.setTime(System.currentTimeMillis());

        if (listeners != null) {
-            for (AuditListener l : listeners) {
+            for (EventListenerProvider l : listeners) {
                try {
                    l.onEvent(event);
                } catch (Throwable t) {
-                    log.error("Failed to send event to " + l, t);
+                    log.error("Failed to send type to " + l, t);
                }
            }
        }
@@ -1,11 +1,11 @@
-package org.keycloak.audit;
+package org.keycloak.events;

 import org.keycloak.provider.Provider;

 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public interface AuditListener extends Provider {
+public interface EventListenerProvider extends Provider {

    public void onEvent(Event event);

@@ -1,10 +1,10 @@
-package org.keycloak.audit;
+package org.keycloak.events;

 import org.keycloak.provider.ProviderFactory;

 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public interface AuditListenerFactory extends ProviderFactory<AuditListener> {
+public interface EventListenerProviderFactory extends ProviderFactory<EventListenerProvider> {

 }
@@ -1,4 +1,4 @@
-package org.keycloak.audit;
+package org.keycloak.events;

 import org.keycloak.provider.Provider;
 import org.keycloak.provider.ProviderFactory;
@@ -7,21 +7,21 @@ import org.keycloak.provider.Spi;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class AuditProviderSpi implements Spi {
+public class EventListenerSpi implements Spi {

    @Override
    public String getName() {
-        return "audit";
+        return "eventsListener";
    }

    @Override
    public Class<? extends Provider> getProviderClass() {
-        return AuditProvider.class;
+        return EventListenerProvider.class;
    }

    @Override
    public Class<? extends ProviderFactory> getProviderFactoryClass() {
-        return AuditProviderFactory.class;
+        return EventListenerProviderFactory.class;
    }

 }
@@ -1,4 +1,4 @@
-package org.keycloak.audit;
+package org.keycloak.events;

 import java.util.List;

@@ -7,7 +7,7 @@ import java.util.List;
 */
 public interface EventQuery {

-    public EventQuery event(EventType... events);
+    public EventQuery type(EventType... types);

    public EventQuery realm(String realmId);

@@ -1,9 +1,9 @@
-package org.keycloak.audit;
+package org.keycloak.events;

 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public interface AuditProvider extends AuditListener {
+public interface EventStoreProvider extends EventListenerProvider {

    public EventQuery createQuery();

@@ -1,10 +1,10 @@
-package org.keycloak.audit;
+package org.keycloak.events;

 import org.keycloak.provider.ProviderFactory;

 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public interface AuditProviderFactory extends ProviderFactory<AuditProvider> {
+public interface EventStoreProviderFactory extends ProviderFactory<EventStoreProvider> {

 }
@@ -1,4 +1,4 @@
-package org.keycloak.audit;
+package org.keycloak.events;

 import org.keycloak.provider.Provider;
 import org.keycloak.provider.ProviderFactory;
@@ -7,21 +7,21 @@ import org.keycloak.provider.Spi;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class AuditListenerSpi implements Spi {
+public class EventStoreSpi implements Spi {

    @Override
    public String getName() {
-        return "audit-listener";
+        return "eventsStore";
    }

    @Override
    public Class<? extends Provider> getProviderClass() {
-        return AuditListener.class;
+        return EventStoreProvider.class;
    }

    @Override
    public Class<? extends ProviderFactory> getProviderFactoryClass() {
-        return AuditListenerFactory.class;
+        return EventStoreProviderFactory.class;
    }

 }
@@ -1,4 +1,4 @@
-package org.keycloak.audit;
+package org.keycloak.events;

 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
@@ -0,0 +1,2 @@
+org.keycloak.events.EventListenerSpi
+org.keycloak.events.EventStoreSpi
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <project>
    <parent>
-        <artifactId>keycloak-audit-parent</artifactId>
+        <artifactId>keycloak-events-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>

-    <artifactId>keycloak-audit-email</artifactId>
-    <name>Keycloak Audit Email Provider</name>
+    <artifactId>keycloak-events-email</artifactId>
+    <name>Keycloak Events Email Provider</name>
    <description/>

    <dependencies>
@@ -27,7 +27,7 @@
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-audit-api</artifactId>
+            <artifactId>keycloak-events-api</artifactId>
            <version>${project.version}</version>
            <scope>provided</scope>
        </dependency>
@@ -1,9 +1,9 @@
-package org.keycloak.audit.email;
+package org.keycloak.events.email;

 import org.jboss.logging.Logger;
-import org.keycloak.audit.AuditListener;
-import org.keycloak.audit.Event;
-import org.keycloak.audit.EventType;
+import org.keycloak.events.EventListenerProvider;
+import org.keycloak.events.Event;
+import org.keycloak.events.EventType;
 import org.keycloak.email.EmailException;
 import org.keycloak.email.EmailProvider;
 import org.keycloak.models.KeycloakSession;
@@ -16,16 +16,16 @@ import java.util.Set;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class EmailAuditListener implements AuditListener {
+public class EmailEventListenerProvider implements EventListenerProvider {

-    private static final Logger log = Logger.getLogger(EmailAuditListener.class);
+    private static final Logger log = Logger.getLogger(EmailEventListenerProvider.class);

    private KeycloakSession session;
    private RealmProvider model;
    private EmailProvider emailProvider;
    private Set<EventType> includedEvents;

-    public EmailAuditListener(KeycloakSession session, EmailProvider emailProvider, Set<EventType> includedEvents) {
+    public EmailEventListenerProvider(KeycloakSession session, EmailProvider emailProvider, Set<EventType> includedEvents) {
        this.session = session;
        this.model = session.realms();
        this.emailProvider = emailProvider;
@@ -34,7 +34,7 @@ public class EmailAuditListener implements AuditListener {

    @Override
    public void onEvent(Event event) {
-        if (includedEvents.contains(event.getEvent())) {
+        if (includedEvents.contains(event.getType())) {
            if (event.getRealmId() != null && event.getUserId() != null) {
                RealmModel realm = model.getRealm(event.getRealmId());
                UserModel user = session.users().getUserById(event.getUserId(), realm);
@@ -42,7 +42,7 @@ public class EmailAuditListener implements AuditListener {
                    try {
                        emailProvider.setRealm(realm).setUser(user).sendEvent(event);
                    } catch (EmailException e) {
-                        log.error("Failed to send event mail", e);
+                        log.error("Failed to send type mail", e);
                    }
                }
            }
@@ -1,9 +1,9 @@
-package org.keycloak.audit.email;
+package org.keycloak.events.email;

 import org.keycloak.Config;
-import org.keycloak.audit.AuditListener;
-import org.keycloak.audit.AuditListenerFactory;
-import org.keycloak.audit.EventType;
+import org.keycloak.events.EventListenerProvider;
+import org.keycloak.events.EventListenerProviderFactory;
+import org.keycloak.events.EventType;
 import org.keycloak.email.EmailProvider;
 import org.keycloak.models.KeycloakSession;

@@ -14,7 +14,7 @@ import java.util.Set;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class EmailAuditListenerFactory implements AuditListenerFactory {
+public class EmailEventListenerProviderFactory implements EventListenerProviderFactory {

    private static final Set<EventType> SUPPORTED_EVENTS = new HashSet<EventType>();
    static {
@@ -24,9 +24,9 @@ public class EmailAuditListenerFactory implements AuditListenerFactory {
    private Set<EventType> includedEvents = new HashSet<EventType>();

    @Override
-    public AuditListener create(KeycloakSession session) {
+    public EventListenerProvider create(KeycloakSession session) {
        EmailProvider emailProvider = session.getProvider(EmailProvider.class);
-        return new EmailAuditListener(session, emailProvider, includedEvents);
+        return new EmailEventListenerProvider(session, emailProvider, includedEvents);
    }

    @Override
@@ -0,0 +1 @@
+org.keycloak.events.email.EmailEventListenerProviderFactory
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <project>
    <parent>
-        <artifactId>keycloak-audit-parent</artifactId>
+        <artifactId>keycloak-events-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>

-    <artifactId>keycloak-audit-jboss-logging</artifactId>
-    <name>Keycloak Audit JBoss Logging Provider</name>
+    <artifactId>keycloak-events-jboss-logging</artifactId>
+    <name>Keycloak Events JBoss Logging Provider</name>
    <description/>

    <dependencies>
@@ -32,7 +32,7 @@
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-audit-api</artifactId>
+            <artifactId>keycloak-events-api</artifactId>
            <version>${project.version}</version>
            <scope>provided</scope>
        </dependency>
@@ -1,19 +1,19 @@
-package org.keycloak.audit.log;
+package org.keycloak.events.log;

 import org.jboss.logging.Logger;
-import org.keycloak.audit.AuditListener;
-import org.keycloak.audit.Event;
+import org.keycloak.events.EventListenerProvider;
+import org.keycloak.events.Event;

 import java.util.Map;

 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class JBossLoggingAuditListener implements AuditListener {
+public class JBossLoggingEventListenerProvider implements EventListenerProvider {

    private final Logger logger;

-    public JBossLoggingAuditListener(Logger logger) {
+    public JBossLoggingEventListenerProvider(Logger logger) {
        this.logger = logger;
    }

@@ -24,8 +24,8 @@ public class JBossLoggingAuditListener implements AuditListener {
        if (logger.isEnabled(level)) {
            StringBuilder sb = new StringBuilder();

-            sb.append("event=");
-            sb.append(event.getEvent());
+            sb.append("type=");
+            sb.append(event.getType());
            sb.append(", realmId=");
            sb.append(event.getRealmId());
            sb.append(", clientId=");
@@ -1,23 +1,23 @@
-package org.keycloak.audit.log;
+package org.keycloak.events.log;

 import org.jboss.logging.Logger;
 import org.keycloak.Config;
-import org.keycloak.audit.AuditListener;
-import org.keycloak.audit.AuditListenerFactory;
+import org.keycloak.events.EventListenerProvider;
+import org.keycloak.events.EventListenerProviderFactory;
 import org.keycloak.models.KeycloakSession;

 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class JBossLoggingAuditListenerFactory implements AuditListenerFactory {
+public class JBossLoggingEventListenerProviderFactory implements EventListenerProviderFactory {

    public static final String ID = "jboss-logging";

-    private static final Logger logger = Logger.getLogger("org.keycloak.audit");
+    private static final Logger logger = Logger.getLogger("org.keycloak.events");

    @Override
-    public AuditListener create(KeycloakSession session) {
-        return new JBossLoggingAuditListener(logger);
+    public EventListenerProvider create(KeycloakSession session) {
+        return new JBossLoggingEventListenerProvider(logger);
    }

    @Override
@@ -0,0 +1 @@
+org.keycloak.events.log.JBossLoggingEventListenerProviderFactory
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <project>
    <parent>
-        <artifactId>keycloak-audit-parent</artifactId>
+        <artifactId>keycloak-events-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>

-    <artifactId>keycloak-audit-jpa</artifactId>
-    <name>Keycloak Audit JPA Provider</name>
+    <artifactId>keycloak-events-jpa</artifactId>
+    <name>Keycloak Events Store JPA Provider</name>
    <description/>

    <dependencies>
@@ -33,7 +33,7 @@
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-audit-api</artifactId>
+            <artifactId>keycloak-events-api</artifactId>
            <version>${project.version}</version>
            <scope>provided</scope>
        </dependency>
@@ -1,4 +1,4 @@
-package org.keycloak.audit.jpa;
+package org.keycloak.events.jpa;

 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -19,8 +19,8 @@ public class EventEntity {
    @Column(name="TIME")
    private long time;

-    @Column(name="EVENT")
-    private String event;
+    @Column(name="TYPE")
+    private String type;

    @Column(name="REALM_ID")
    private String realmId;
@@ -59,12 +59,12 @@ public class EventEntity {
        this.time = time;
    }

-    public String getEvent() {
-        return event;
+    public String getType() {
+        return type;
    }

-    public void setEvent(String event) {
-        this.event = event;
+    public void setType(String type) {
+        this.type = type;
    }

    public String getRealmId() {
@@ -1,8 +1,8 @@
-package org.keycloak.audit.jpa;
+package org.keycloak.events.jpa;

-import org.keycloak.audit.Event;
-import org.keycloak.audit.EventQuery;
-import org.keycloak.audit.EventType;
+import org.keycloak.events.Event;
+import org.keycloak.events.EventQuery;
+import org.keycloak.events.EventType;

 import javax.persistence.EntityManager;
 import javax.persistence.TypedQuery;
@@ -37,12 +37,12 @@ public class JpaEventQuery implements EventQuery {
    }

    @Override
-    public EventQuery event(EventType... events) {
+    public EventQuery type(EventType... types) {
        List<String> eventStrings = new LinkedList<String>();
-        for (EventType e : events) {
+        for (EventType e : types) {
            eventStrings.add(e.toString());
        }
-        predicates.add(root.get("event").in(eventStrings));
+        predicates.add(root.get("type").in(eventStrings));
        return this;
    }

@@ -102,7 +102,7 @@ public class JpaEventQuery implements EventQuery {

        List<Event> events = new LinkedList<Event>();
        for (EventEntity e : query.getResultList()) {
-            events.add(JpaAuditProvider.convert(e));
+            events.add(JpaEventStoreProvider.convert(e));
        }

        return events;
@@ -1,12 +1,12 @@
-package org.keycloak.audit.jpa;
+package org.keycloak.events.jpa;

 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;
 import org.jboss.logging.Logger;
-import org.keycloak.audit.AuditProvider;
-import org.keycloak.audit.Event;
-import org.keycloak.audit.EventQuery;
-import org.keycloak.audit.EventType;
+import org.keycloak.events.EventStoreProvider;
+import org.keycloak.events.Event;
+import org.keycloak.events.EventQuery;
+import org.keycloak.events.EventType;

 import javax.persistence.EntityManager;
 import javax.persistence.EntityTransaction;
@@ -18,18 +18,18 @@ import java.util.UUID;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class JpaAuditProvider implements AuditProvider {
+public class JpaEventStoreProvider implements EventStoreProvider {

    private static final ObjectMapper mapper = new ObjectMapper();
    private static final TypeReference<Map<String, String>> mapType = new TypeReference<Map<String, String>>() {
    };
-    private static final Logger logger = Logger.getLogger(JpaAuditProvider.class);
+    private static final Logger logger = Logger.getLogger(JpaEventStoreProvider.class);

    private EntityManager em;
    private EntityTransaction tx;
    private Set<EventType> includedEvents;

-    public JpaAuditProvider(EntityManager em, Set<EventType> includedEvents) {
+    public JpaEventStoreProvider(EntityManager em, Set<EventType> includedEvents) {
        this.em = em;
        this.includedEvents = includedEvents;
    }
@@ -56,7 +56,7 @@ public class JpaAuditProvider implements AuditProvider {

    @Override
    public void onEvent(Event event) {
-        if (includedEvents.contains(event.getEvent())) {
+        if (includedEvents.contains(event.getType())) {
            em.persist(convert(event));
        }
    }
@@ -69,7 +69,7 @@ public class JpaAuditProvider implements AuditProvider {
        EventEntity e = new EventEntity();
        e.setId(UUID.randomUUID().toString());
        e.setTime(o.getTime());
-        e.setEvent(o.getEvent().toString());
+        e.setType(o.getType().toString());
        e.setRealmId(o.getRealmId());
        e.setClientId(o.getClientId());
        e.setUserId(o.getUserId());
@@ -87,7 +87,7 @@ public class JpaAuditProvider implements AuditProvider {
    static Event convert(EventEntity o) {
        Event e = new Event();
        e.setTime(o.getTime());
-        e.setEvent(EventType.valueOf(o.getEvent()));
+        e.setType(EventType.valueOf(o.getType()));
        e.setRealmId(o.getRealmId());
        e.setClientId(o.getClientId());
        e.setUserId(o.getUserId());
@@ -1,9 +1,9 @@
-package org.keycloak.audit.jpa;
+package org.keycloak.events.jpa;

 import org.keycloak.Config;
-import org.keycloak.audit.AuditProvider;
-import org.keycloak.audit.AuditProviderFactory;
-import org.keycloak.audit.EventType;
+import org.keycloak.events.EventStoreProvider;
+import org.keycloak.events.EventStoreProviderFactory;
+import org.keycloak.events.EventType;
 import org.keycloak.connections.jpa.JpaConnectionProvider;
 import org.keycloak.models.KeycloakSession;

@@ -13,16 +13,16 @@ import java.util.Set;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class JpaAuditProviderFactory implements AuditProviderFactory {
+public class JpaEventStoreProviderFactory implements EventStoreProviderFactory {

    public static final String ID = "jpa";

    private Set<EventType> includedEvents = new HashSet<EventType>();

    @Override
-    public AuditProvider create(KeycloakSession session) {
+    public EventStoreProvider create(KeycloakSession session) {
        JpaConnectionProvider connection = session.getProvider(JpaConnectionProvider.class);
-        return new JpaAuditProvider(connection.getEntityManager(), includedEvents);
+        return new JpaEventStoreProvider(connection.getEntityManager(), includedEvents);
    }

    @Override
@@ -0,0 +1 @@
+org.keycloak.events.jpa.JpaEventStoreProviderFactory
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <project>
    <parent>
-        <artifactId>keycloak-audit-parent</artifactId>
+        <artifactId>keycloak-events-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>

-    <artifactId>keycloak-audit-mongo</artifactId>
-    <name>Keycloak Audit Mongo Provider</name>
+    <artifactId>keycloak-events-mongo</artifactId>
+    <name>Keycloak Events Store Mongo Provider</name>
    <description/>

    <dependencies>
@@ -33,7 +33,7 @@
        </dependency>
        <dependency>
            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-audit-api</artifactId>
+            <artifactId>keycloak-events-api</artifactId>
            <version>${project.version}</version>
            <scope>provided</scope>
        </dependency>
@@ -1,11 +1,11 @@
-package org.keycloak.audit.mongo;
+package org.keycloak.events.mongo;

 import com.mongodb.BasicDBObject;
 import com.mongodb.DBCollection;
 import com.mongodb.DBCursor;
-import org.keycloak.audit.Event;
-import org.keycloak.audit.EventQuery;
-import org.keycloak.audit.EventType;
+import org.keycloak.events.Event;
+import org.keycloak.events.EventQuery;
+import org.keycloak.events.EventType;

 import java.util.LinkedList;
 import java.util.List;
@@ -26,12 +26,12 @@ public class MongoEventQuery implements EventQuery {
    }

    @Override
-    public EventQuery event(EventType... events) {
+    public EventQuery type(EventType... types) {
        List<String> eventStrings = new LinkedList<String>();
-        for (EventType e : events) {
+        for (EventType e : types) {
            eventStrings.add(e.toString());
        }
-        query.put("event", new BasicDBObject("$in", eventStrings));
+        query.put("type", new BasicDBObject("$in", eventStrings));
        return this;
    }

@@ -83,7 +83,7 @@ public class MongoEventQuery implements EventQuery {

        List<Event> events = new LinkedList<Event>();
        while (cur.hasNext()) {
-            events.add(MongoAuditProvider.convert((BasicDBObject) cur.next()));
+            events.add(MongoEventStoreProvider.convert((BasicDBObject) cur.next()));
        }

        return events;
@@ -1,12 +1,12 @@
-package org.keycloak.audit.mongo;
+package org.keycloak.events.mongo;

 import com.mongodb.BasicDBObject;
 import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
-import org.keycloak.audit.AuditProvider;
-import org.keycloak.audit.Event;
-import org.keycloak.audit.EventQuery;
-import org.keycloak.audit.EventType;
+import org.keycloak.events.EventStoreProvider;
+import org.keycloak.events.Event;
+import org.keycloak.events.EventQuery;
+import org.keycloak.events.EventType;

 import java.util.HashMap;
 import java.util.Map;
@@ -15,29 +15,29 @@ import java.util.Set;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class MongoAuditProvider implements AuditProvider {
+public class MongoEventStoreProvider implements EventStoreProvider {

-    private DBCollection audit;
+    private DBCollection events;
    private Set<EventType> includedEvents;

-    public MongoAuditProvider(DBCollection audit, Set<EventType> includedEvents) {
-        this.audit = audit;
+    public MongoEventStoreProvider(DBCollection events, Set<EventType> includedEvents) {
+        this.events = events;
        this.includedEvents = includedEvents;
    }

    @Override
    public EventQuery createQuery() {
-        return new MongoEventQuery(audit);
+        return new MongoEventQuery(events);
    }

    @Override
    public void clear() {
-        audit.remove(new BasicDBObject());
+        events.remove(new BasicDBObject());
    }

    @Override
    public void clear(String realmId) {
-        audit.remove(new BasicDBObject("realmId", realmId));
+        events.remove(new BasicDBObject("realmId", realmId));
    }

    @Override
@@ -45,13 +45,13 @@ public class MongoAuditProvider implements AuditProvider {
        BasicDBObject q = new BasicDBObject();
        q.put("realmId", realmId);
        q.put("time", new BasicDBObject("$lt", olderThan));
-        audit.remove(q);
+        events.remove(q);
    }

    @Override
    public void onEvent(Event event) {
-        if (includedEvents.contains(event.getEvent())) {
-            audit.insert(convert(event));
+        if (includedEvents.contains(event.getType())) {
+            events.insert(convert(event));
        }
    }

@@ -62,7 +62,7 @@ public class MongoAuditProvider implements AuditProvider {
    static DBObject convert(Event o) {
        BasicDBObject e = new BasicDBObject();
        e.put("time", o.getTime());
-        e.put("event", o.getEvent().toString());
+        e.put("type", o.getType().toString());
        e.put("realmId", o.getRealmId());
        e.put("clientId", o.getClientId());
        e.put("userId", o.getUserId());
@@ -84,7 +84,7 @@ public class MongoAuditProvider implements AuditProvider {
    static Event convert(BasicDBObject o) {
        Event e = new Event();
        e.setTime(o.getLong("time"));
-        e.setEvent(EventType.valueOf(o.getString("event")));
+        e.setType(EventType.valueOf(o.getString("type")));
        e.setRealmId(o.getString("realmId"));
        e.setClientId(o.getString("clientId"));
        e.setUserId(o.getString("userId"));
@@ -1,12 +1,12 @@
-package org.keycloak.audit.mongo;
+package org.keycloak.events.mongo;

 import com.mongodb.DBCollection;
 import com.mongodb.WriteConcern;
 import org.jboss.logging.Logger;
 import org.keycloak.Config;
-import org.keycloak.audit.AuditProvider;
-import org.keycloak.audit.AuditProviderFactory;
-import org.keycloak.audit.EventType;
+import org.keycloak.events.EventStoreProvider;
+import org.keycloak.events.EventStoreProviderFactory;
+import org.keycloak.events.EventType;
 import org.keycloak.connections.mongo.MongoConnectionProvider;
 import org.keycloak.models.KeycloakSession;

@@ -16,22 +16,22 @@ import java.util.Set;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class MongoAuditProviderFactory implements AuditProviderFactory {
+public class MongoEventStoreProviderFactory implements EventStoreProviderFactory {

-    protected static final Logger logger = Logger.getLogger(MongoAuditProviderFactory.class);
+    protected static final Logger logger = Logger.getLogger(MongoEventStoreProviderFactory.class);

    public static final String ID = "mongo";

    private Set<EventType> includedEvents = new HashSet<EventType>();

    @Override
-    public AuditProvider create(KeycloakSession session) {
+    public EventStoreProvider create(KeycloakSession session) {
        MongoConnectionProvider connection = session.getProvider(MongoConnectionProvider.class);

-        DBCollection collection = connection.getDB().getCollection("audit");
+        DBCollection collection = connection.getDB().getCollection("events");
        collection.setWriteConcern(WriteConcern.UNACKNOWLEDGED);

-        return new MongoAuditProvider(collection, includedEvents);
+        return new MongoEventStoreProvider(collection, includedEvents);
    }

    @Override
@@ -0,0 +1 @@
+org.keycloak.events.mongo.MongoEventStoreProviderFactory
@@ -3,16 +3,16 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

-    <name>Audit Parent</name>
+    <name>Events Parent</name>
    <description/>
    <modelVersion>4.0.0</modelVersion>

    <groupId>org.keycloak</groupId>
-    <artifactId>keycloak-audit-parent</artifactId>
+    <artifactId>keycloak-events-parent</artifactId>
    <packaging>pom</packaging>

    <modules>
@@ -0,0 +1,48 @@
+Keycloak Examples
+=================
+
+This directory contains a number of examples for Keycloak.
+
+Demo
+----
+
+This is the our main example, which shows Login, Single-Sign On, Single-Sign Out and OAuth Token Grant. The demo comes in two flavours: 
+
+* Preconfigured - Use this flavour to quickly deploy the demo to a local Keycloak server without having to configure anything other than importing the realm settings into Keycloak
+* Unconfigured - Use this flavour to manually configure and deploy the demo to either a local or external Keycloak server
+
+For more information look at `preconfigured-demo/README.md` or `unconfigured-demo/README.md`. For the unconfigured-demo there's an accompanying screencast at [http://keycloak.org/docs](http://keycloak.org/docs) that walks you through the setup process.
+
+
+Cordova
+-------
+
+Example Cordova application. For more information look at `cordova/README.md`.
+
+
+CORS
+----
+
+Example CORS application. For more information look at `cors/README.md`.
+
+
+JS Console
+----------
+
+Example JavaScript application that let's you experiment with the JavaScript adapter. For more information look at `js-console/README.md`.
+
+
+Providers
+---------
+
+Example providers for Event Listener SPI, Event Store SPI and User Federation SPI. For more information look at:
+
+* Event Listener that outputs event detalis to sysout - `providers/event-listener-sysout/README.md`
+* Event Store that stores events in memory - `providers/event-store-mem/README.md`
+* User Federation that loads users from a text file - `providers/federation-provider/README.md`
+
+
+Themes
+------
+
+Example themes to change the look and feel of login forms, account management console and admin console. For more information look at `themes/README.md`.
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -34,6 +34,7 @@
            </tbody>
        </table>
    </div>
+    <hr />
    <div>
        <h2><span>Realm Roles</span></h2>
        <button type="submit" data-ng-click="loadRoles()">load Roles</button>
@@ -52,6 +53,34 @@
            </tbody>
        </table>
    </div>
+    <hr />
+    <div>
+        <h2><span>Social providers</span></h2>
+        <button type="submit" data-ng-click="loadServerInfo()">load available social providers</button>
+        <table class="table" data-ng-show="serverInfo.socialProviders.length > 0">
+            <thead>
+            <tr>
+                <th>Available social providers</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr data-ng-repeat="sp in serverInfo.socialProviders">
+                <td>{{sp}}</a></td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+    <hr />
+    <div>
+        <h2><span>Realm info</span></h2>
+        <button type="submit" data-ng-click="loadPublicRealmInfo()">Load public realm info</button>
+
+        <div data-ng-show="realm">
+            Realm name: {{realm.realm}} <br/>
+            Public key: {{realm.public_key}} <br/>
+        </div>
+    </div>
+    <hr />
 </div>
 </body>
 </html>
@@ -58,6 +58,20 @@ module.controller('GlobalCtrl', function($scope, $http) {
        });

    };
+
+    $scope.loadServerInfo = function() {
+        $http.get("http://localhost-auth:8080/auth/admin/serverinfo").success(function(data) {
+            $scope.serverInfo = angular.fromJson(data);
+        });
+
+    };
+
+    $scope.loadPublicRealmInfo = function() {
+        $http.get("http://localhost-auth:8080/auth/realms/cors").success(function(data) {
+            $scope.realm = angular.fromJson(data);
+        });
+    };
+
    $scope.logout = logout;
 });

@@ -1,9 +1,11 @@
 {
    "realm": "cors",
    "enabled": true,
-    "accessTokenLifespan": 3000,
-    "accessCodeLifespan": 10,
-    "accessCodeLifespanUserAction": 6000,
+    "accessTokenLifespan": 60,
+    "accessCodeLifespan": 60,
+    "accessCodeLifespanUserAction": 300,
+    "ssoSessionIdleTimeout": 600,
+    "ssoSessionMaxLifespan": 36000,
    "sslRequired": "external",
    "registrationAllowed": false,
    "social": false,
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <name>Examples</name>
@@ -1,10 +0,0 @@
-Login, Distributed SSO, Distributed Logout, and OAuth Token Grant Examples
-===================================
-
-Preconfigured Examples
-===================================
-The Preconfigured Examples (in 'preconfigured-demo') contains pre-configured examples that can be deployed without having to configure anything except importing the realm settings into Keycloak. To try this out follow the instructions in preconfigured-demo/README.md.
-
-Unconfigured Examples
-===================================
-The Unconfigured Examples (in 'unconfigured-demo') contains examples without any Keycloak specific configuration. These should be used in conjunction with the online screencasts tutorials at [http://keycloak.org/docs](http://keycloak.org/docs).
@@ -1,10 +1,137 @@
 Unconfigured Examples
 ===================================
 This set of projects contains a stripped down version of the demo described in preconfigured-demo.  All keycloak specific
-configuration has been removed.  Use this project in conjunction with the online screencast tutorials at
+configuration has been removed. Use this project in conjunction with instructions below and/or the online screencast tutorials at
 [http://keycloak.org/docs](http://keycloak.org/docs).


+# Run Demo with an external Keycloak Server
+
+These instructions assume you've already installed and started a Keycloak Server. Keycloak can be running on your locally or remotely (for example on OpenShift). If you're not running Keycloak locally you'll also need a locally running WildFly server.
+
+## Create Realm
+
+Open the Keycloak admin console and click on `Add Realm`. Enter `demo` as the name for the realm and click `Save`.
+
+The demo applications uses two realm roles, `user` and `admin`, so the next step is to create these. Click on `Roles` then click on `Add Role`. Use `user` as the role name and click `Save`. Repeat to create a role with the name `admin`.
+
+Next you'll either want to enable user registration or create a new user.
+
+### Enable user registration
+
+To enable user registration first click on `Roles` then `Default Roles`. Select the `user` role and click on the right arrow. This will make sure that all new users are automatically assigned the `user` role. Next step is to enable user registration for the realm. Click on `Settings` then `Login`. Click on the toggle for `user registration` to allow users to self-register.
+
+### Create user
+
+To create a new user click on `Users` then `Add User`. You are required to at least fill in the `username` field, but you may want to fill in values for the other fields as well. After you've completed the form click on `Save`. To allow the user to login you also need to set a password for the user. To do this click on `Credentials`. Enter a new password for the user. If you leave the `Temporary` toggle ON the user will be required to reset the password on the next login.


+## Deploy Demo Applications

+First you need to install WildFly application server. Second step is to install the Keycloak WildFly subsystem. To do this run:
+
+    # cd <WILDFLY HOME>
+    # unzip <KEYCLOAK DIST>/adapters/keycloak-wildfly-adapter-dist-<KEYCLOAK VERSION>.zip
+
+Next configure the Keycloak adapter by editing `standalone/configuration/standalone.xml`. Add a new child-element to `<extensions>`:
+
+    <extensions>
+        ....
+        <extension module="org.keycloak.keycloak-wildfly-subsystem"/>
+    </extensions>
+
+You also need to add realm config to the same file. Add a new child-element to `<profile>`:
+
+    <profile>
+        ....
+        <subsystem xmlns="urn:jboss:domain:keycloak:1.0">
+            <realm name="demo">
+                <realm-public-key>REALM PUBLIC KEY</realm-public-key>
+                <auth-server-url>KEYCLOAK URL</auth-server-url>
+                <ssl-required>external</ssl-required>
+            </realm>
+        </subsystem>
+    </profile>
+
+In the above snippet replace the following:
+
+* `REALM PUBLIC KEY` - replace with the public key for the realm. You can find this in the admin console by selecting the realm, then clicking on `Keys`
+* `KEYCLOAK URL` - replace with the base url of Keycloak (for example http://localhost:8080/auth or http://keycloak.example.org/auth)
+
+Don't start the WildFly server until you've configured and deployed the demo applications.
+
+### Database Services
+
+Most demo applications connects to the REST services provided by the database-services application, so start with deploying this.
+
+Run the following to deploy it:
+
+    # cd database-services
+    # mvn install
+    # cp target/database.war <WILDFLY HOME>/standalone/deployments
+
+Next add the configuration for it to the Keycloak subsystem. Edit `<WILDFLY HOME>/standalone/configuration/standalone.xml` to `<subsystem xmlns="urn:jboss:domain:keycloak:1.0">` add:
+
+    <secure-deployment name="database.war">
+        <realm>demo</realm>
+        <resource>database-service</resource>
+        <bearer-only>true</bearer-only>
+    </secure-deployment>
+
+### Customer Portal
+
+Next deploy the customer portal application.
+
+Run the following to deploy it:
+
+    # cd customer-app
+    # mvn install
+    # cp target/customer-portal.war <WILDFLY HOME>/standalone/deployments
+
+Then open the Keycloak admin console to add a configuration for it. Navigate to the realm and click on `Applications` then `Add Application`. Fill in the form with:
+
+* Name - `customer-portal`
+* Redirect URI - `http://localhost:8080/customer-portal/*` (click `Add` after filling in the field)
+
+Then click on `Save`. As it's a confidential (non-public) application you need the secret for it. Click on `Credentials` and note the value of the `Secret` field.
+
+Then edit `<WILDFLY HOME>/standalone/configuration/standalone.xml` and add the following to `<subsystem xmlns="urn:jboss:domain:keycloak:1.0">`:
+
+    <secure-deployment name="customer-portal.war">
+        <realm>demo</realm>
+        <resource>customer-portal</resource>
+        <credential name="secret">APPLICATION SECRET</credential>
+    </secure-deployment>
+
+In the above snippet replace the following:
+
+* `APPLICATION SECRET` - replace with the applications secret you just noted from the Keycloak admin console
+
+### Product Portal
+
+Next deploy the product portal application.
+
+Run the following to deploy it:
+
+    # cd product-app
+    # mvn install
+    # cp target/product-portal.war <WILDFLY HOME>/standalone/deployments
+
+Then open the Keycloak admin console to add a configuration for it. Navigate to the realm and click on `Applications` then `Add Application`. Fill in the form with:
+
+* Name - `product-portal`
+* Redirect URI - `http://localhost:8080/product-portal/*` (click `Add` after filling in the field)
+
+Then click on `Save`. As it's a confidential (non-public) application you need the secret for it. Click on `Credentials` and note the value of the `Secret` field.
+
+Then edit `<WILDFLY HOME>/standalone/configuration/standalone.xml` and add the following to `<subsystem xmlns="urn:jboss:domain:keycloak:1.0">`:
+
+    <secure-deployment name="product-portal.war">
+        <realm>demo</realm>
+        <resource>product-portal</resource>
+        <credential name="secret">484ba263-8bb5-4048-bb6f-40da75e9eefb</credential>
+    </secure-deployment>
+
+In the above snippet replace the following:
+
+* `APPLICATION SECRET` - replace with the applications secret you just noted from the Keycloak admin console
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <name>Examples</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.0-rc-1</version>
+        <version>1.0-final</version>
        <relativePath>../../pom.xml</relativePath> 
    </parent>
    <modelVersion>4.0.0</modelVersion>
Author	SHA1	Message	Date
Marek Posolda	5e51204114	Merge pull request #686 from mposolda/master KEYCLOAK-674 Reduce info level logging in adapters	2014-09-10 16:04:48 +02:00
mposolda	4c0751c1a0	KEYCLOAK-674 Reduce info level logging in adapters	2014-09-10 16:02:22 +02:00
Marek Posolda	ec1434c65e	Merge pull request #685 from mposolda/master Support for cors in PublicRealmResource	2014-09-10 13:16:21 +02:00
mposolda	aa7bbeb11b	Support for cors in PublicRealmResource	2014-09-10 13:05:53 +02:00
Marek Posolda	88a39dbaf7	Merge pull request #683 from mposolda/master KEYCLOAK-670 allow ServerInfo to be available with cors	2014-09-10 10:52:33 +02:00
mposolda	52920119bd	Ensure that ServerInfo request is authorized and add CORS support to it	2014-09-10 10:42:05 +02:00
mposolda	47ac358bb6	Fix timeouts in cors example	2014-09-10 10:42:04 +02:00
Stian Thorgersen	62aa2d7f65	Merge pull request #684 from stianst/master Fix CRSF protection on Chrome, and add check if 'Referer' header	2014-09-10 10:34:49 +02:00
Stian Thorgersen	557de7690e	Fix CRSF protection on Chrome, and add check if 'Referer' header	2014-09-10 10:32:56 +02:00
Bill Burke	4c8da3d614	Merge pull request #682 from patriot1burke/master version bump	2014-09-09 13:35:39 -04:00
Bill Burke	3f539c6d5c	version bump	2014-09-09 13:34:56 -04:00
Bill Burke	5b1d67f17d	Merge pull request #681 from patriot1burke/master change CSRF to random value	2014-09-09 13:27:59 -04:00
Bill Burke	e3e32982a0	change CSRF to random value	2014-09-09 13:27:34 -04:00
Bill Burke	b771cd30e7	Merge pull request #680 from patriot1burke/master nolog CORS exception	2014-09-09 12:54:55 -04:00
Bill Burke	ac29db51e5	nolog CORS exception	2014-09-09 12:51:55 -04:00
Bill Burke	6e3770f04a	Merge pull request #679 from patriot1burke/master CSRF	2014-09-09 12:07:29 -04:00
Bill Burke	d0a3a04d34	CSRF	2014-09-09 12:06:48 -04:00
Stian Thorgersen	c5662020d8	Merge pull request #678 from stianst/master Moved logo-example themes to examples/themes	2014-09-09 14:09:58 +02:00
Stian Thorgersen	fea0d1af66	Moved logo-example themes to examples/themes	2014-09-09 14:09:32 +02:00
Stian Thorgersen	30cd28d288	Merge pull request #677 from stianst/master KEYCLOAK-668 Make sure keycloak.js doesn't send multiple concurrent requ...	2014-09-09 13:46:21 +02:00
Stian Thorgersen	c475721dab	KEYCLOAK-668 Make sure keycloak.js doesn't send multiple concurrent requests to refresh the token	2014-09-09 13:45:55 +02:00
Stian Thorgersen	839069ca15	Merge pull request #676 from stianst/master Fixes to admin console random logout	2014-09-09 11:02:19 +02:00
Stian Thorgersen	09860f1ee1	Fix test	2014-09-09 11:01:24 +02:00
Stian Thorgersen	a1b6378bef	KEYCLOAK-667 Remove client-side idle timeout from admin console - with sso idle timeout we have a server-side mechanism for this	2014-09-09 11:01:24 +02:00
Stian Thorgersen	3530fa6259	KEYCLOAK-666 Update session last refreshed on every token refresh	2014-09-09 11:01:24 +02:00
Bill Burke	d22afd78e6	Merge pull request #675 from patriot1burke/master doc update	2014-09-08 09:09:07 -04:00
Bill Burke	f1986093e6	doc update	2014-09-08 09:07:51 -04:00
Stian Thorgersen	6c5477bc02	Merge pull request #674 from stianst/master Minor fixes to theme docs	2014-09-08 14:59:34 +02:00
Stian Thorgersen	ae6fd458e8	Minor fixes to theme docs	2014-09-08 14:59:09 +02:00
Stian Thorgersen	cdda48d895	Merge pull request #673 from stianst/master Typo fix in docs	2014-09-08 10:25:18 +02:00
Stian Thorgersen	556314ae15	Typo fix in docs	2014-09-08 10:24:47 +02:00
Stian Thorgersen	a2845fa0b4	Merge pull request #672 from stianst/master Added instruction to manually configure and deploy the unconfigured demo	2014-09-03 13:32:33 +02:00
Stian Thorgersen	8c4a3374d3	Added instruction to manually configure and deploy the unconfigured demo	2014-09-03 13:20:58 +02:00
Stian Thorgersen	b97106b750	Adding changes to examples overview readme	2014-09-03 13:18:14 +02:00
Stian Thorgersen	7907abd206	Merge pull request #671 from stianst/master Added README.md with Overview of all examples	2014-09-03 11:22:42 +02:00
Stian Thorgersen	090871f8b9	Added README.md with Overview of all examples	2014-09-03 11:22:08 +02:00
Stian Thorgersen	0baf12c0ef	Merge pull request #670 from stianst/master Updates to server-installation docs	2014-09-03 10:13:36 +02:00
Stian Thorgersen	1599371ee5	Updates to server-installation docs	2014-09-03 10:13:05 +02:00
Stian Thorgersen	3bc27ef366	Merge pull request #669 from stianst/master Fix AccountTest.viewLog test	2014-09-03 08:53:56 +02:00
Stian Thorgersen	d5c5cc8321	Fix AccountTest.viewLog test	2014-09-03 08:53:02 +02:00
Bill Burke	aea00fc574	Merge pull request #668 from patriot1burke/master admin theme refactor	2014-09-02 11:37:32 -04:00
Bill Burke	e9dc8b2460	refactor admin theme	2014-09-02 11:36:59 -04:00
Bill Burke	eaed199b20	add logo example theme	2014-09-02 11:11:26 -04:00
Marek Posolda	f7fcefc11c	Merge pull request #667 from mposolda/master KEYCLOAK-659 Export current version number during export	2014-09-02 17:09:10 +02:00
mposolda	1f0dcbddbe	KEYCLOAK-659 Export current version number during export	2014-09-02 17:06:58 +02:00
Stian Thorgersen	9af0743883	Merge pull request #666 from stianst/master Updated docs to inherit project version from keycloak-parent	2014-09-02 14:07:24 +02:00
Stian Thorgersen	7d4863783c	Use keycloak-parent in docbook to inherit project version	2014-09-02 13:57:23 +02:00
Stian Thorgersen	d87718f768	Inject project version from pom	2014-09-02 13:22:15 +02:00
Stian Thorgersen	c7ba6159b5	Merge pull request #665 from stianst/master Doc fix	2014-09-02 12:52:42 +02:00
Stian Thorgersen	b43909aff1	Doc fix	2014-09-02 12:52:22 +02:00
Marek Posolda	87d9a5422d	Merge pull request #664 from mposolda/master Use stronger passwords in LDAP tests due to password policy on MSAD2012	2014-09-02 12:49:34 +02:00
mposolda	44937d33ad	Use stronger passwords in LDAP tests due to password policy on MSAD2012	2014-09-02 12:43:14 +02:00
Stian Thorgersen	b561080f3a	Merge pull request #663 from stianst/master Fix search for users by attribute on mongo	2014-09-02 11:52:15 +02:00
Stian Thorgersen	d905ce12e3	Fix search for users by attribute on mongo	2014-09-02 11:51:29 +02:00
Marek Posolda	7040bd1c51	Merge pull request #662 from mposolda/master Fix SyncProvidersTest with ActiveDirectory	2014-09-02 11:12:43 +02:00
mposolda	cd91a29a89	Fix SyncProvidersTest with ActiveDirectory	2014-09-02 11:06:31 +02:00
Stian Thorgersen	b1b452815a	Merge pull request #661 from stianst/master KEYCLOAK-656 Remove login-status-iframe from dist	2014-09-02 10:54:52 +02:00
Stian Thorgersen	59d66dd20e	KEYCLOAK-656 Remove login-status-iframe from dist	2014-09-02 10:54:26 +02:00
Stian Thorgersen	0763d0d9d6	Merge pull request #660 from stianst/master KEYCLOAK-658 Fix searching for users	2014-09-02 10:02:08 +02:00
Stian Thorgersen	8c8c44e50f	KEYCLOAK-658 Fix searching for users	2014-09-02 10:01:44 +02:00
Marek Posolda	14b1941454	Merge pull request #659 from mposolda/master Added more props to LDAPEmbeddedServer to allow automated test with Acti...	2014-09-01 20:54:49 +02:00
mposolda	e52811ac28	Added more props to LDAPEmbeddedServer to allow automated test with ActiveDirectory	2014-09-01 20:43:14 +02:00
Stian Thorgersen	4f3a980f8b	Merge pull request #658 from stianst/master Version bump	2014-09-01 10:17:31 +02:00
Stian Thorgersen	05a1fc1ded	Version bump	2014-09-01 10:17:00 +02:00
Stian Thorgersen	ff74d1ddc0	Merge pull request #657 from stianst/master Various fixes	2014-08-29 17:11:53 +02:00
Stian Thorgersen	31b0f5543f	Fixes	2014-08-29 17:11:18 +02:00
Stian Thorgersen	39c0be5d99	KEYCLOAK-652 Social user can't set password	2014-08-29 16:51:10 +02:00
Stian Thorgersen	fb18789b05	KEYCLOAK-650 Server error while trying to download keycloak.json for oauth client	2014-08-29 16:08:42 +02:00
Stian Thorgersen	bcbf5da4b8	KEYCLOAK-651 Page not found trying to save changes to brute force	2014-08-29 16:04:37 +02:00
Stian Thorgersen	e1b9dfe65d	KEYCLOAK-649 Invalidate realm if app name or client clientId is changed	2014-08-29 15:49:17 +02:00
Stian Thorgersen	52f86f2293	Merge pull request #656 from stianst/master Fixes to event-store-mem example	2014-08-29 14:56:09 +02:00
Stian Thorgersen	e413694cf5	Fixes to event-store-mem example	2014-08-29 14:55:45 +02:00
Stian Thorgersen	20ce36dc64	Merge pull request #655 from stianst/master Clean user credential management form	2014-08-29 11:06:11 +02:00
Stian Thorgersen	a3c982a630	Clean user credential management form	2014-08-29 11:05:37 +02:00
Stian Thorgersen	e0542b5260	Merge pull request #654 from stianst/master KEYCLOAK-648 Fix removing role from composite role	2014-08-29 10:27:29 +02:00
Stian Thorgersen	7c7025a83d	KEYCLOAK-648 Fix removing role from composite role	2014-08-29 10:18:00 +02:00
Stian Thorgersen	3e6a1f47ec	Merge pull request #653 from stianst/master Fix test	2014-08-29 09:10:41 +02:00
Stian Thorgersen	32703d19a0	Fix test	2014-08-29 08:59:57 +02:00
Stian Thorgersen	cdc6588ac1	Merge branch 'ungarida-master'	2014-08-28 14:30:29 +02:00
Stian Thorgersen	57aea9b51c	Merge branch 'master' of https://github.com/ungarida/keycloak into ungarida-master Conflicts: integration/tomcat7/adapter/src/main/java/org/keycloak/adapters/tomcat7/AuthenticatedActionsValve.java	2014-08-28 14:29:07 +02:00
Stian Thorgersen	a2171bf777	Merge pull request #652 from stianst/master Password token	2014-08-28 14:22:51 +02:00
Stian Thorgersen	b9d0f64f74	Added password token to use inplace of plain-text password for totp	2014-08-28 13:51:55 +02:00
Stian Thorgersen	55d614fce8	Reduce log in UserFederationResource	2014-08-28 11:26:55 +02:00
Stian Thorgersen	46d118207a	Merge pull request #651 from stianst/master Rename audit to events	2014-08-28 11:07:02 +02:00
Stian Thorgersen	3bfe3d256e	Rename audit to events	2014-08-28 10:56:37 +02:00
Marek Posolda	b50ab14a0a	Merge pull request #650 from mposolda/master More Federation & LDAP fixes	2014-08-27 12:41:38 +02:00
mposolda	08c58cf2f2	Upgrade picketlink to 2.7.0.Beta1	2014-08-27 12:22:15 +02:00
mposolda	d26543360b	KEYCLOAK-646 Fix LDAP authentication when there are commas in the value of bindingProperty	2014-08-27 12:19:23 +02:00
mposolda	fb18004c1d	KEYCLOAK-643 Handle flows with adding user with existing username or email in federation providers	2014-08-27 12:19:23 +02:00
Stian Thorgersen	49fb452a79	Merge pull request #649 from stianst/master KEYCLOAK-531 Reduce info level logging	2014-08-27 11:17:56 +02:00
Stian Thorgersen	55bd889a0f	KEYCLOAK-531 Reduce info level logging	2014-08-27 11:17:24 +02:00
Stian Thorgersen	269a0dbec1	Merge pull request #643 from ssilvert/KEYCLOAK-642-subsys-wfcontroller KEYCLOAK-642 Latest WildFly breaks Keycloak Subsystem	2014-08-27 08:19:20 +02:00
Marek Posolda	cf51db88e7	Merge pull request #648 from mposolda/master Federation & LDAP related fixes	2014-08-26 20:43:23 +02:00
mposolda	fc0889cd2e	KEYCLOAK-644 Searching by email from LDAP doesn't work	2014-08-26 20:24:25 +02:00
mposolda	b3b480c25f	Display proper error message if LDAP-linked user couldn't be deleted due to read-only mode	2014-08-26 19:10:48 +02:00
mposolda	892fa04130	KEYCLOAK-645 Disable username field when editing user in admin console	2014-08-26 18:04:26 +02:00
Marek Posolda	8d3e51c236	Merge pull request #647 from mposolda/master Handle exceptions and UI errors when user is read only. Minor sync issue	2014-08-26 13:02:11 +02:00
mposolda	fd9d2ba4d5	Handle exceptions and UI errors when user is read only. Some sync issues	2014-08-26 12:54:05 +02:00
Marek Posolda	75bc633a33	Merge pull request #645 from mposolda/master Fix pagination of searching users	2014-08-25 21:14:56 +02:00
mposolda	3fdb22cb05	Fix pagination of searching users	2014-08-25 21:13:50 +02:00
Marek Posolda	f51ba1cb8a	Merge pull request #644 from mposolda/master Docs about sync. Tooltips and minor fixes	2014-08-25 17:19:02 +02:00
mposolda	688f4a07a3	Added docs about sync of users	2014-08-25 17:17:32 +02:00
mposolda	6c7d0f27a7	More tooltips for LDAP and generic federation. Minor fixes	2014-08-25 16:28:52 +02:00
Stan Silvert	1e5ca3062c	KEYCLOAK-642 Latest WildFly breaks Keycloak Subsystem	2014-08-22 13:49:57 -04:00
Bill Burke	ca97e7ba35	Merge pull request #642 from patriot1burke/master import console from export	2014-08-21 17:25:16 -04:00
Bill Burke	e99afec7ec	import console from export	2014-08-21 17:17:09 -04:00
Bill Burke	a23853a6bc	Merge pull request #641 from patriot1burke/master bump pom	2014-08-21 10:47:22 -04:00
Bill Burke	7c8edb5d11	bump pom	2014-08-21 10:46:49 -04:00
Davide Ungari	5764ad84e9	Fix equals huge error, too much Javascript lately	2014-07-27 10:02:41 +02:00
Davide Ungari	f3fde4a8df	Upgrade to tomcat.7.0.54	2014-07-27 10:01:02 +02:00
Davide Ungari	983ccdd121	Merge remote-tracking branch 'upstream/master'	2014-07-26 11:27:08 +02:00
Davide Ungari	73ed22c52c	logout	2014-07-26 11:25:27 +02:00
				`@@ -1 +0,0 @@`
				`org.keycloak.audit.email.EmailAuditListenerFactory`
				`@@ -1 +0,0 @@`
				`org.keycloak.audit.log.JBossLoggingAuditListenerFactory`
				`@@ -1 +0,0 @@`
				`org.keycloak.audit.jpa.JpaAuditProviderFactory`
				`@@ -1 +0,0 @@`
				`org.keycloak.audit.mongo.MongoAuditProviderFactory`
				`@@ -0,0 +1 @@`
				`org.keycloak.events.email.EmailEventListenerProviderFactory`
				`@@ -0,0 +1 @@`
				`org.keycloak.events.log.JBossLoggingEventListenerProviderFactory`
				`@@ -0,0 +1 @@`
				`org.keycloak.events.jpa.JpaEventStoreProviderFactory`
				`@@ -0,0 +1 @@`
				`org.keycloak.events.mongo.MongoEventStoreProviderFactory`