Set version to 1.8.0.Alpha1

KEYCLOAK-2223 Upgrade to WildFly 10.0.0.CR4
Merge pull request #1941 from patriot1burke/master
2015-12-13 20:54:39 +00:00 · 2015-12-13 21:26:07 +01:00 · 2015-12-11 21:02:40 -05:00 · 2015-12-11 17:56:45 -05:00 · 2015-12-11 10:31:55 -05:00 · 2015-12-11 10:31:42 -05:00
544 changed files with 8018 additions and 1982 deletions
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</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.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</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.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</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.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-client-registration-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
    </parent>

    <name>Keycloak Client Registration Parent</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</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.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</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.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</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.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+    <changeSet author="mposolda@redhat.com" id="1.8.0">
+
+        <addColumn tableName="IDENTITY_PROVIDER">
+            <column name="POST_BROKER_LOGIN_FLOW_ID" type="VARCHAR(36)">
+                <constraints nullable="true"/>
+            </column>
+        </addColumn>
+        <createTable tableName="CLIENT_TEMPLATE">
+            <column name="ID" type="VARCHAR(36)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="NAME" type="VARCHAR(255)"/>
+            <column name="REALM_ID" type="VARCHAR(36)"/>
+            <column name="DESCRIPTION" type="VARCHAR(255)"/>
+            <column name="PROTOCOL" type="VARCHAR(255)"/>
+        </createTable>
+
+
+
+        <dropNotNullConstraint tableName="PROTOCOL_MAPPER" columnName="CLIENT_ID" columnDataType="VARCHAR(36)"/>
+        <addColumn tableName="CLIENT">
+            <column name="CLIENT_TEMPLATE_ID" type="VARCHAR(36)">
+                <constraints nullable="true"/>
+            </column>
+        </addColumn>
+        <addColumn tableName="PROTOCOL_MAPPER">
+            <column name="CLIENT_TEMPLATE_ID" type="VARCHAR(36)">
+                <constraints nullable="true"/>
+            </column>
+        </addColumn>
+        <createTable tableName="REALM_CLIENT_TEMPLATE">
+            <column name="CLIENT_TEMPLATE_ID" type="VARCHAR(36)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="REALM_ID" type="VARCHAR(36)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+
+        <addPrimaryKey columnNames="ID" constraintName="PK_CLI_TEMPLATE" tableName="CLIENT_TEMPLATE"/>
+        <addUniqueConstraint columnNames="REALM_ID,NAME" constraintName="UK_CLI_TEMPLATE" tableName="CLIENT_TEMPLATE"/>
+        <addForeignKeyConstraint baseColumnNames="REALM_ID" baseTableName="CLIENT_TEMPLATE" constraintName="FK_REALM_CLI_TMPLT" referencedColumnNames="ID" referencedTableName="REALM"/>
+        <addForeignKeyConstraint baseColumnNames="CLIENT_TEMPLATE_ID" baseTableName="PROTOCOL_MAPPER" constraintName="FK_CLI_TMPLT_MAPPER" referencedColumnNames="ID" referencedTableName="CLIENT_TEMPLATE"/>
+        <addForeignKeyConstraint baseColumnNames="CLIENT_TEMPLATE_ID" baseTableName="CLIENT" constraintName="FK_CLI_TMPLT_CLIENT" referencedColumnNames="ID" referencedTableName="CLIENT_TEMPLATE"/>
+        <addForeignKeyConstraint baseColumnNames="REALM_ID" baseTableName="REALM_CLIENT_TEMPLATE" constraintName="FK_RLM_CLI_TMPLT_RLM" referencedColumnNames="ID" referencedTableName="REALM"/>
+        <addForeignKeyConstraint baseColumnNames="CLIENT_TEMPLATE_ID" baseTableName="REALM_CLIENT_TEMPLATE" constraintName="FK_RLM_CLI_TMPLT_CLI" referencedColumnNames="ID" referencedTableName="CLIENT_TEMPLATE"/>
+
+
+    </changeSet>
+</databaseChangeLog>
@@ -11,4 +11,5 @@
    <include file="META-INF/jpa-changelog-1.5.0.xml"/>
    <include file="META-INF/jpa-changelog-1.6.1.xml"/>
    <include file="META-INF/jpa-changelog-1.7.0.xml"/>
+    <include file="META-INF/jpa-changelog-1.8.0.xml"/>
 </databaseChangeLog>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -35,6 +35,7 @@
        <class>org.keycloak.models.jpa.entities.GroupAttributeEntity</class>
        <class>org.keycloak.models.jpa.entities.GroupRoleMappingEntity</class>
        <class>org.keycloak.models.jpa.entities.UserGroupMembershipEntity</class>
+        <class>org.keycloak.models.jpa.entities.ClientTemplateEntity</class>

        <!-- JpaAuditProviders -->
        <class>org.keycloak.events.jpa.EventEntity</class>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</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.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</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.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
    </parent>
    <name>Connections Parent</name>
    <description/>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -40,6 +40,7 @@ public class ClientRepresentation {
    protected Integer nodeReRegistrationTimeout;
    protected Map<String, Integer> registeredNodes;
    protected List<ProtocolMapperRepresentation> protocolMappers;
+    protected String clientTemplate;

    public String getId() {
        return id;
@@ -290,4 +291,11 @@ public class ClientRepresentation {
        this.protocolMappers = protocolMappers;
    }

+    public String getClientTemplate() {
+        return clientTemplate;
+    }
+
+    public void setClientTemplate(String clientTemplate) {
+        this.clientTemplate = clientTemplate;
+    }
 }
@@ -0,0 +1,61 @@
+package org.keycloak.representations.idm;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class ClientTemplateRepresentation {
+    /**
+     * Use this value in ClientRepresentation.setClientTemplate when you want to clear this value
+     */
+    public static final String NONE = "NONE";
+    protected String id;
+    protected String name;
+    protected String description;
+    protected String protocol;
+    protected List<ProtocolMapperRepresentation> protocolMappers;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+
+    public List<ProtocolMapperRepresentation> getProtocolMappers() {
+        return protocolMappers;
+    }
+
+    public void setProtocolMappers(List<ProtocolMapperRepresentation> protocolMappers) {
+        this.protocolMappers = protocolMappers;
+    }
+
+    public String getProtocol() {
+        return protocol;
+    }
+
+    public void setProtocol(String protocol) {
+        this.protocol = protocol;
+    }
+}
@@ -54,6 +54,7 @@ public class IdentityProviderRepresentation {
    protected boolean addReadTokenRoleOnCreate;
    protected boolean authenticateByDefault;
    protected String firstBrokerLoginFlowAlias;
+    protected String postBrokerLoginFlowAlias;
    protected Map<String, String> config = new HashMap<String, String>();

    public String getInternalId() {
@@ -139,6 +140,14 @@ public class IdentityProviderRepresentation {
        this.firstBrokerLoginFlowAlias = firstBrokerLoginFlowAlias;
    }

+    public String getPostBrokerLoginFlowAlias() {
+        return postBrokerLoginFlowAlias;
+    }
+
+    public void setPostBrokerLoginFlowAlias(String postBrokerLoginFlowAlias) {
+        this.postBrokerLoginFlowAlias = postBrokerLoginFlowAlias;
+    }
+
    public boolean isStoreToken() {
        return this.storeToken;
    }
@@ -65,6 +65,7 @@ public class RealmRepresentation {
    protected List<ScopeMappingRepresentation> scopeMappings;
    protected Map<String, List<ScopeMappingRepresentation>> clientScopeMappings;
    protected List<ClientRepresentation> clients;
+    protected List<ClientTemplateRepresentation> clientTemplates;
    protected Map<String, String> browserSecurityHeaders;
    protected Map<String, String> smtpServer;
    protected List<UserFederationProviderRepresentation> userFederationProviders;
@@ -804,4 +805,12 @@ public class RealmRepresentation {
    public void setGroups(List<GroupRepresentation> groups) {
        this.groups = groups;
    }
+
+    public List<ClientTemplateRepresentation> getClientTemplates() {
+        return clientTemplates;
+    }
+
+    public void setClientTemplates(List<ClientTemplateRepresentation> clientTemplates) {
+        this.clientTemplates = clientTemplates;
+    }
 }
@@ -1,15 +1,25 @@
-package org.keycloak.services.resources.admin.info;
+package org.keycloak.representations.info;

 public class MemoryInfoRepresentation {

    protected long total;
+    protected String totalFormated;
    protected long used;
+    protected String usedFormated;
+    protected long free;
+    protected long freePercentage;
+    protected String freeFormated;

    public static MemoryInfoRepresentation create() {
        MemoryInfoRepresentation rep = new MemoryInfoRepresentation();
        Runtime runtime = Runtime.getRuntime();
        rep.total = runtime.maxMemory();
+        rep.totalFormated = formatMemory(rep.total);
        rep.used = runtime.totalMemory() - runtime.freeMemory();
+        rep.usedFormated = formatMemory(rep.used);
+        rep.free = rep.total - rep.used;
+        rep.freeFormated = formatMemory(rep.free);
+        rep.freePercentage = rep.free * 100 / rep.total;
        return rep;
    }

@@ -18,15 +28,15 @@ public class MemoryInfoRepresentation {
    }

    public String getTotalFormated() {
-        return formatMemory(getTotal());
+        return totalFormated;
    }

    public long getFree() {
-        return getTotal() - getUsed();
+        return free;
    }

    public String getFreeFormated() {
-        return formatMemory(getFree());
+        return freeFormated;
    }

    public long getUsed() {
@@ -34,14 +44,14 @@ public class MemoryInfoRepresentation {
    }

    public String getUsedFormated() {
-        return formatMemory(getUsed());
+        return usedFormated;
    }

    public long getFreePercentage() {
-        return getFree() * 100 / getTotal();
+        return freePercentage;
    }

-    private String formatMemory(long bytes) {
+    private static String formatMemory(long bytes) {
        if (bytes > 1024L * 1024L) {
            return bytes / (1024L * 1024L) + " MB";
        } else if (bytes > 1024L) {
@@ -1,4 +1,4 @@
-package org.keycloak.services.resources.admin.info;
+package org.keycloak.representations.info;

 import java.util.Map;

@@ -1,4 +1,4 @@
-package org.keycloak.services.resources.admin.info;
+package org.keycloak.representations.info;

 import org.keycloak.representations.idm.ProtocolMapperRepresentation;
 import org.keycloak.representations.idm.ProtocolMapperTypeRepresentation;
@@ -1,4 +1,4 @@
-package org.keycloak.services.resources.admin.info;
+package org.keycloak.representations.info;

 import java.util.Map;

@@ -1,7 +1,6 @@
-package org.keycloak.services.resources.admin.info;
+package org.keycloak.representations.info;

 import org.keycloak.common.Version;
-import org.keycloak.models.KeycloakSession;

 import java.util.Date;
 import java.util.Locale;
@@ -27,11 +26,11 @@ public class SystemInfoRepresentation {
    private String userTimezone;
    private String userLocale;

-    public static SystemInfoRepresentation create(KeycloakSession session) {
+    public static SystemInfoRepresentation create(long serverStartupTime) {
        SystemInfoRepresentation rep = new SystemInfoRepresentation();
        rep.version = Version.VERSION;
        rep.serverTime = new Date().toString();
-        rep.uptimeMillis = System.currentTimeMillis() - session.getKeycloakSessionFactory().getServerStartupTimestamp();
+        rep.uptimeMillis = System.currentTimeMillis() - serverStartupTime;
        rep.uptime = formatUptime(rep.uptimeMillis);
        rep.javaVersion = System.getProperty("java.version");
        rep.javaVendor = System.getProperty("java.vendor");
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>keycloak-parent</artifactId>
 		<groupId>org.keycloak</groupId>
-		<version>1.7.0.Final-SNAPSHOT</version>
+		<version>1.8.0.Alpha1</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.7.0.Final-SNAPSHOT</version>
+		<version>1.8.0.Alpha1</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.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -8,7 +8,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak AS7 / JBoss EAP 6 Adapter Distros</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OSGI Features</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OSGI JAAS Realm Configuration</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak OSGI Integration</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Wildfly 8 Adapter</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -8,7 +8,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Wildfly Adapter</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -8,7 +8,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -1,7 +1,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                xmlns:xalan="http://xml.apache.org/xalan"
-                xmlns:j="urn:jboss:domain:3.0"
-                xmlns:ds="urn:jboss:domain:datasources:3.0"
+                xmlns:j="urn:jboss:domain:4.0"
+                xmlns:ds="urn:jboss:domain:datasources:4.0"
                xmlns:k="urn:jboss:domain:keycloak:1.1"
                xmlns:sec="urn:jboss:domain:security:1.2"
                version="2.0"
@@ -25,7 +25,7 @@
    <xsl:template match="//ds:datasources">
        <xsl:copy>
            <xsl:apply-templates select="node()[name(.)='datasource']"/>
-            <datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true">
+            <datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" use-java-context="true">
                <connection-url>jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE</connection-url>
                <driver>h2</driver>
                <security>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>distribution-pom</artifactId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
    </parent>

    <artifactId>keycloak-dist-downloads</artifactId>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>feature-packs-parent</artifactId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>distribution-pom</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>Feature Pack Builds</name>
@@ -20,7 +20,7 @@
    <parent>
        <groupId>org.keycloak</groupId>
        <artifactId>feature-packs-parent</artifactId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@@ -4,7 +4,6 @@
   <subsystems name="default">
      <!-- Each subsystem to be included relative to the src/main/resources directory -->
      <subsystem>logging.xml</subsystem>
-      <subsystem>batch.xml</subsystem>
      <subsystem>bean-validation.xml</subsystem>
      <subsystem>keycloak-datasources.xml</subsystem>
      <subsystem>ee.xml</subsystem>
@@ -19,23 +18,17 @@
      <subsystem>jsf.xml</subsystem>
      <subsystem>mail.xml</subsystem>
      <subsystem>naming.xml</subsystem>
-      <subsystem>pojo.xml</subsystem>
      <subsystem>remoting.xml</subsystem>
-      <subsystem>resource-adapters.xml</subsystem>
      <subsystem>request-controller.xml</subsystem>
-      <subsystem>sar.xml</subsystem>
      <subsystem>security.xml</subsystem>
      <subsystem>security-manager.xml</subsystem>
      <subsystem>transactions.xml</subsystem>
      <subsystem>undertow.xml</subsystem>
-      <subsystem>webservices.xml</subsystem>
-      <subsystem>weld.xml</subsystem>
      <subsystem>keycloak-server.xml</subsystem>
   </subsystems>
   <subsystems name="ha">
      <!-- Each subsystem to be included relative to the src/main/resources directory -->
      <subsystem>logging.xml</subsystem>
-      <subsystem>batch.xml</subsystem>
      <subsystem>bean-validation.xml</subsystem>
      <subsystem>keycloak-datasources.xml</subsystem>
      <subsystem>ee.xml</subsystem>
@@ -52,23 +45,17 @@
      <subsystem>mail.xml</subsystem>
      <subsystem>mod_cluster.xml</subsystem>
      <subsystem>naming.xml</subsystem>
-      <subsystem>pojo.xml</subsystem>
      <subsystem>remoting.xml</subsystem>
-      <subsystem>resource-adapters.xml</subsystem>
      <subsystem>request-controller.xml</subsystem>
-      <subsystem>sar.xml</subsystem>
      <subsystem>security.xml</subsystem>
      <subsystem>security-manager.xml</subsystem>
      <subsystem>transactions.xml</subsystem>
      <subsystem supplement="ha">undertow.xml</subsystem>
-      <subsystem>webservices.xml</subsystem>
-      <subsystem>weld.xml</subsystem>
      <subsystem>keycloak-server.xml</subsystem>
   </subsystems>
   <subsystems name="full">
      <!-- Each subsystem to be included relative to the src/main/resources directory -->
      <subsystem>logging.xml</subsystem>
-      <subsystem>batch.xml</subsystem>
      <subsystem>bean-validation.xml</subsystem>
      <subsystem>keycloak-datasources.xml</subsystem>
      <subsystem supplement="full">ee.xml</subsystem>
@@ -86,23 +73,17 @@
      <subsystem>mail.xml</subsystem>
      <subsystem>messaging.xml</subsystem>
      <subsystem>naming.xml</subsystem>
-      <subsystem>pojo.xml</subsystem>
      <subsystem>remoting.xml</subsystem>
-      <subsystem>resource-adapters.xml</subsystem>
      <subsystem>request-controller.xml</subsystem>
-      <subsystem>sar.xml</subsystem>
      <subsystem>security.xml</subsystem>
      <subsystem>security-manager.xml</subsystem>
      <subsystem>transactions.xml</subsystem>
      <subsystem>undertow.xml</subsystem>
-      <subsystem>webservices.xml</subsystem>
-      <subsystem>weld.xml</subsystem>
      <subsystem>keycloak-server.xml</subsystem>
   </subsystems>
   <subsystems name="full-ha">
      <!-- Each subsystem to be included relative to the src/main/resources directory -->
      <subsystem>logging.xml</subsystem>
-      <subsystem>batch.xml</subsystem>
      <subsystem>bean-validation.xml</subsystem>
      <subsystem>keycloak-datasources.xml</subsystem>
      <subsystem supplement="full">ee.xml</subsystem>
@@ -122,17 +103,13 @@
      <subsystem supplement="ha">messaging.xml</subsystem>
      <subsystem>mod_cluster.xml</subsystem>
      <subsystem>naming.xml</subsystem>
-      <subsystem>pojo.xml</subsystem>
      <subsystem>remoting.xml</subsystem>
      <subsystem>resource-adapters.xml</subsystem>
      <subsystem>request-controller.xml</subsystem>
-      <subsystem>sar.xml</subsystem>
      <subsystem>security.xml</subsystem>
      <subsystem>security-manager.xml</subsystem>
      <subsystem>transactions.xml</subsystem>
      <subsystem supplement="ha">undertow.xml</subsystem>
-      <subsystem>webservices.xml</subsystem>
-      <subsystem>weld.xml</subsystem>
      <subsystem>keycloak-server.xml</subsystem>
   </subsystems>
 </config>
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>

-<domain xmlns="urn:jboss:domain:3.0">
+<domain xmlns="urn:jboss:domain:4.0">

    <extensions>
        <?EXTENSIONS?>
@@ -24,18 +24,18 @@
    </management>

    <profiles>
-       <profile name="default">
-           <?SUBSYSTEMS socket-binding-group="standard-sockets"?>
-       </profile>
-       <profile name="ha">
-           <?SUBSYSTEMS socket-binding-group="ha-sockets"?>
-       </profile>
-       <profile name="full">
-           <?SUBSYSTEMS socket-binding-group="full-sockets"?>
-       </profile>
-       <profile name="full-ha">
-           <?SUBSYSTEMS socket-binding-group="full-ha-sockets"?>
-       </profile>
+        <profile name="default">
+            <?SUBSYSTEMS socket-binding-group="standard-sockets"?>
+        </profile>
+        <profile name="ha">
+            <?SUBSYSTEMS socket-binding-group="ha-sockets"?>
+        </profile>
+        <profile name="full">
+            <?SUBSYSTEMS socket-binding-group="full-sockets"?>
+        </profile>
+        <profile name="full-ha">
+            <?SUBSYSTEMS socket-binding-group="full-ha-sockets"?>
+        </profile>
    </profiles>

    <!--
@@ -48,7 +48,7 @@
    <interfaces>
        <interface name="management"/>
        <interface name="public"/>
-        <interface name="unsecure"/>
+        <?INTERFACES?>
    </interfaces>

    <socket-binding-groups>
@@ -3,7 +3,6 @@
 <config>
   <subsystems>
      <subsystem>logging.xml</subsystem>
-      <subsystem>batch.xml</subsystem>
      <subsystem>bean-validation.xml</subsystem>
      <subsystem>keycloak-datasources.xml</subsystem>
      <subsystem>ee.xml</subsystem>
@@ -20,17 +19,12 @@
      <subsystem>mail.xml</subsystem>
      <subsystem>mod_cluster.xml</subsystem>
      <subsystem>naming.xml</subsystem>
-      <subsystem>pojo.xml</subsystem>
      <subsystem>remoting.xml</subsystem>
-      <subsystem>resource-adapters.xml</subsystem>
      <subsystem>request-controller.xml</subsystem>
-      <subsystem>sar.xml</subsystem>
      <subsystem>security-manager.xml</subsystem>
      <subsystem>security.xml</subsystem>
      <subsystem>transactions.xml</subsystem>
      <subsystem supplement="ha">undertow.xml</subsystem>
-      <subsystem>webservices.xml</subsystem>
-      <subsystem>weld.xml</subsystem>
      <subsystem>keycloak-server.xml</subsystem>
   </subsystems>
 </config>
@@ -3,7 +3,6 @@
 <config>
   <subsystems>
      <subsystem>logging.xml</subsystem>
-      <subsystem>batch.xml</subsystem>
      <subsystem>bean-validation.xml</subsystem>
      <subsystem>keycloak-datasources.xml</subsystem>
      <subsystem>ee.xml</subsystem>
@@ -18,17 +17,12 @@
      <subsystem>jsf.xml</subsystem>
      <subsystem>mail.xml</subsystem>
      <subsystem>naming.xml</subsystem>
-      <subsystem>pojo.xml</subsystem>
      <subsystem>remoting.xml</subsystem>
-      <subsystem>resource-adapters.xml</subsystem>
      <subsystem>request-controller.xml</subsystem>
-      <subsystem>sar.xml</subsystem>
      <subsystem>security-manager.xml</subsystem>
      <subsystem>security.xml</subsystem>
      <subsystem>transactions.xml</subsystem>
      <subsystem>undertow.xml</subsystem>
-      <subsystem>webservices.xml</subsystem>
-      <subsystem>weld.xml</subsystem>
      <subsystem>keycloak-server.xml</subsystem>
   </subsystems>
 </config>
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>

-<server xmlns="urn:jboss:domain:3.0">
+<server xmlns="urn:jboss:domain:4.0">

    <extensions>
        <?EXTENSIONS?>
@@ -29,15 +29,15 @@
        </security-realms>
        <audit-log>
            <formatters>
-               <json-formatter name="json-formatter"/>
-            </formatters>        
+                <json-formatter name="json-formatter"/>
+            </formatters>
            <handlers>
-               <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
+                <file-handler name="file" formatter="json-formatter" relative-to="jboss.server.data.dir" path="audit-log.log"/>
            </handlers>
            <logger log-boot="true" log-read-only="false" enabled="false">
-               <handlers>
-                  <handler name="file"/>
-               </handlers>
+                <handlers>
+                    <handler name="file"/>
+                </handlers>
            </logger>
        </audit-log>
        <management-interfaces>
@@ -70,11 +70,7 @@
            <inet-address value="${jboss.bind.address:127.0.0.1}"/>
        </interface>
        <!-- TODO - only show this if the jacorb subsystem is added  -->
-        <interface name="unsecure">
-            <!-- Used for IIOP sockets in the standard configuration.
-                 To secure JacORB you need to setup SSL -->
-            <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
-        </interface>
+        <?INTERFACES?>
    </interfaces>

    <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}">
@@ -84,4 +80,4 @@
        <?SOCKET-BINDINGS?>

    </socket-binding-group>
-</server>
+</server>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -8,7 +8,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak SAML AS7 / JBoss EAP 6 Adapter Distros</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>
    <name>Keycloak Wildfly SAML Adapter</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -8,7 +8,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -8,7 +8,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -15,7 +15,7 @@


    <modules>
-        <module>wf9-server-overlay</module>
+        <module>wildfly</module>
        <module>eap6</module>
    </modules>
 </project>
@@ -1,10 +0,0 @@
-/subsystem=datasources/data-source=KeycloakDS/:add(connection-url="jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE",driver-name=h2,jndi-name=java:jboss/datasources/KeycloakDS,password=sa,user-name=sa,use-java-context=true)
-/subsystem=infinispan/cache-container=keycloak:add(jndi-name="infinispan/Keycloak")
-/subsystem=infinispan/cache-container=keycloak/transport=TRANSPORT:add(lock-timeout=60000)
-/subsystem=infinispan/cache-container=keycloak/invalidation-cache=realms:add(mode="SYNC")
-/subsystem=infinispan/cache-container=keycloak/invalidation-cache=users:add(mode="SYNC")
-/subsystem=infinispan/cache-container=keycloak/distributed-cache=sessions:add(mode="SYNC",owners="1")
-/subsystem=infinispan/cache-container=keycloak/distributed-cache=loginFailures:add(mode="SYNC",owners="1")
-/extension=org.keycloak.keycloak-server-subsystem/:add(module=org.keycloak.keycloak-server-subsystem)
-/subsystem=keycloak-server:add(web-context=auth)
-:shutdown(restart=true)
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-docbook-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -802,7 +802,7 @@ public class SecretQuestionRequiredActionFactory implements RequiredActionFactor
        <section>
            <title>Packaging the Action</title>
            <para>
-                You will package your classes within a single jar.  This jar must contain a file named  <literal>org.keycloak.authentication.ForActionFactory</literal>
+                You will package your classes within a single jar.  This jar must contain a file named  <literal>org.keycloak.authentication.FormActionFactory</literal>
                and must be contained in the <literal>META-INF/services/</literal> directory of your jar.  This file must list the fully qualified classname
                of each FormActionFactory implementation you have in the jar.  For example:
                <programlisting>
@@ -332,6 +332,16 @@
                            More details in <link linkend="identity-broker-first-login">First Login section</link>.
                        </entry>
                    </row>
+                    <row>
+                        <entry>
+                            <literal>Post Login Flow</literal>
+                        </entry>
+                        <entry>Alias of authentication flow, which is triggered after each login with this identity provider. Useful if you want additional verification of each user
+                            authenticated with this identity provider (for example OTP). Leave this empty if you don't want any additional authenticators to be triggered after login
+                            with this identity provider. Also note, that authenticator implementations must assume that user is already
+                            set in ClientSession as identity provider already set it.
+                        </entry>
+                    </row>
                </tbody>
            </tgroup>
        </table>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <name>Keycloak Documentation</name>
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>keycloak-docbook-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-events-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -64,6 +64,8 @@ public enum EventType {
    IDENTITY_PROVIDER_LOGIN_ERROR(false),
    IDENTITY_PROVIDER_FIRST_LOGIN(true),
    IDENTITY_PROVIDER_FIRST_LOGIN_ERROR(true),
+    IDENTITY_PROVIDER_POST_LOGIN(true),
+    IDENTITY_PROVIDER_POST_LOGIN_ERROR(true),
    IDENTITY_PROVIDER_RESPONSE(false),
    IDENTITY_PROVIDER_RESPONSE_ERROR(false),
    IDENTITY_PROVIDER_RETRIEVE_TOKEN(false),
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-events-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>keycloak-events-parent</artifactId>
        <groupId>org.keycloak</groupId>
-        <version>1.7.0.Final-SNAPSHOT</version>
+        <version>1.8.0.Alpha1</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
Author	SHA1	Message	Date
keycloak-bot	732ccb8920	Set version to 1.8.0.Alpha1	2015-12-13 20:54:39 +00:00
Marko Strukelj	32af1bd3a5	KEYCLOAK-2223 Upgrade to WildFly 10.0.0.CR4	2015-12-13 21:26:07 +01:00
Bill Burke	38b9d05cd7	Merge pull request #1941 from patriot1burke/master client templates	2015-12-11 21:02:40 -05:00
Bill Burke	e26e31d8b4	client template ui	2015-12-11 17:56:45 -05:00
Bill Burke	2328e0a6f9	Merge remote-tracking branch 'upstream/master'	2015-12-11 10:31:55 -05:00
Bill Burke	96e1813b34	client templates backend	2015-12-11 10:31:42 -05:00
Pavel Drozd	b466cec4e5	Merge pull request #1940 from vramik/master arquillian-testsuite: updated screenshooter version	2015-12-11 15:32:51 +01:00
Pavel Drozd	9228c6a16b	Merge pull request #1938 from mhajas/fixDataTable Fix adapter tests errors caused by changed DataTable fragment	2015-12-11 15:29:28 +01:00
Pavel Drozd	35f8e3c19f	Merge pull request #1937 from pdrozd/ssl-required Support for testing ssl-required.	2015-12-11 15:28:38 +01:00
vramik	9956f425eb	arquillian-testsuite: updated screenshooter version	2015-12-11 12:15:27 +01:00
mhajas	dcaf7ea9d5	Fix test errors caused by changed DataTable fragment	2015-12-10 11:46:40 +01:00
Pavel Drozd	3f51f620b7	Support for testing ssl-required.	2015-12-10 07:21:23 +01:00
Marek Posolda	06e44b185e	Merge pull request #1936 from mposolda/master KEYCLOAK-2124 Post-Broker login flow support	2015-12-09 17:35:00 +01:00
mposolda	17a2bd266b	KEYCLOAK-2124 post-broker login flow docs	2015-12-09 17:34:44 +01:00
mposolda	081db0d353	KEYCLOAK-2124 Post-Broker login flow support	2015-12-09 16:36:26 +01:00
Marek Posolda	df26caed07	Merge pull request #1933 from vramik/clients KEYCLOAK-2203, KEYCLOAK-2205	2015-12-09 10:28:56 +01:00
Marek Posolda	9f9067663f	Merge pull request #1932 from mhajas/fixDataTable Fix xpath for rows in DataTable fragment	2015-12-09 10:28:48 +01:00
Marek Posolda	0f3d8b8513	Merge pull request #1935 from thomasdarimont/patch-1 Fixed missing ':' in the JSON example.	2015-12-09 08:52:32 +01:00
mhajas	4ca3bf530f	Merge remote-tracking branch 'upstream/master' into fixDataTable	2015-12-09 07:41:45 +01:00
Thomas Darimont	c8c0a45ce4	Fixed missing ':' in the JSON example.	2015-12-08 18:45:25 +01:00
Stian Thorgersen	7313b843b9	Merge pull request #1934 from stianst/KEYCLOAK-1900-PASS-HASH KEYCLOAK-1900 Password Hash SPI	2015-12-08 16:17:32 +01:00
Stian Thorgersen	321cac2ab8	KEYCLOAK-1900 Refactoring	2015-12-08 14:06:40 +01:00
tsudot	162dd4051d	KEYCLOAK-1900 Add password hash SPI and provider - Default encoder set to Pbkdf2PasswordEncoder	2015-12-08 13:25:59 +01:00
vramik	cd19c1acdf	fix tests witch fails with phantomjs	2015-12-08 08:40:40 +01:00
vramik	44ed912154	Merge branch 'master' of https://github.com/keycloak/keycloak into clients Conflicts: testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/clients/CreateClientForm.java testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/FlashMessage.java testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/OnOffSwitch.java testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientRolesTest.java	2015-12-07 15:45:02 +01:00
vramik	39856c32d1	Merge branch 'master' of https://github.com/keycloak/keycloak into clients Conflicts: testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/clients/CreateClientForm.java testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/FlashMessage.java testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/OnOffSwitch.java testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientRolesTest.java	2015-12-07 15:44:34 +01:00
vramik	d3a893b171	KEYCLOAK-2203 - Add new cluster node form doesn't validate host input	2015-12-07 15:28:39 +01:00
vramik	ba861f227e	added UI tests for client's tabs: clustering, installation	2015-12-07 15:09:24 +01:00
Tomas Kyjovsky	4a57bcc0b4	Merge pull request #1903 from tkyjovsk/master Increased pageload timeout. Increased other timeouts for travis. Better handling of closeable alert messages.	2015-12-07 11:09:37 +01:00
Tomas Kyjovsky	87a8e017fa	Disabled crudRole test, unstable. Role tests need rewrite.	2015-12-07 09:10:32 +01:00
Tomas Kyjovsky	b8fe608aaf	Merge upstream-master	2015-12-07 05:59:51 +01:00
mhajas	d3e6b38a8e	Fix xpath for DataTable row and tests	2015-12-04 14:26:24 +01:00
Marek Posolda	8589327cdd	Merge pull request #1931 from mposolda/master KEYCLOAK-2197 Fix broker tests to work with sybase. Added LoggingRule	2015-12-04 12:24:33 +01:00
vramik	1b936a1230	added UI tests for client scope	2015-12-04 12:04:39 +01:00
mposolda	45c490b640	KEYCLOAK-2197 Fix broker tests to work with sybase. Added LoggingRule	2015-12-04 11:44:30 +01:00
vramik	1dd3fc537b	added UI tests for client mappers saml	2015-12-03 14:47:13 +01:00
Stian Thorgersen	73cf2404ff	Merge pull request #1928 from stianst/master KEYCLOAK-2176 Add default roles and actions to users created with add…	2015-12-03 13:30:29 +01:00
vramik	c16b6e6a43	update ClientSettingsTest due to KEYCLOAK-1129	2015-12-03 12:49:29 +01:00
Stian Thorgersen	8d23422605	KEYCLOAK-2176 Add default roles and actions to users created with add-user script	2015-12-03 11:45:56 +01:00
Stian Thorgersen	9cd8d1612e	Merge pull request #1926 from ssilvert/mappers-tooltip Fix typo for mappers.tooltip	2015-12-03 11:44:39 +01:00
Stian Thorgersen	277faea1d0	Merge pull request #1924 from ppalaga/151202-rename-w9-subsystem-dir Rename keycloak-wf9-subsystem directory to keycloak-wildfly-subsystem to match t	2015-12-03 10:53:36 +01:00
Stian Thorgersen	58c7b6090b	Merge pull request #1919 from stianst/master Cache fixes	2015-12-03 10:53:18 +01:00
Stian Thorgersen	f45bb62fcc	KEYCLOAK-2192 Class serialization issues when Realm and User caches are in ASYNC mode	2015-12-03 08:24:30 +01:00
Stian Thorgersen	34c3ffaae1	Ported AdminApiTest to use admin client	2015-12-03 08:24:23 +01:00
Stian Thorgersen	a218cc3034	KEYCLOAK-2179 Cache fixes	2015-12-03 08:24:16 +01:00
Stan Silvert	c62b3822f4	Fix typo for mappers.tooltip	2015-12-02 11:54:02 -05:00
Tomas Kyjovsky	b0e9720f88	Increased arquillian timeouts.	2015-12-02 16:46:15 +01:00
Tomas Kyjovsky	6507f58b49	Merge upstream-master	2015-12-02 16:11:45 +01:00
Tomas Kyjovsky	46e2440d30	Refactoring of arquillian waiting methods.	2015-12-02 15:58:23 +01:00
vramik	9b51b6e43b	Merge upstream/master into clients	2015-12-02 15:18:15 +01:00
Peter Palaga	4772b8401a	KEYCLOAK-2099 fixup: Rename keycloak-wf9-subsystem directory to keycloak-wildfly-subsystem to match the WF module it contains	2015-12-02 14:51:48 +01:00
vramik	2b25c120d4	added UI tests for client mappers oidc	2015-12-02 13:12:05 +01:00
Marek Posolda	c19e65f93c	Merge pull request #1922 from mposolda/master Minor fixes in kerberos example	2015-12-02 12:15:18 +01:00
mposolda	87994e032d	Minor fixes in kerberos example	2015-12-02 11:31:12 +01:00
Stian Thorgersen	ee6753d31b	KEYCLOAK-1813 KEYCLOAK-2182 Fixes enable/disable cache	2015-12-02 11:24:04 +01:00
Stian Thorgersen	09c18306c2	KEYCLOAK-2179 Realm and user cache is invalidated when added to other nodes	2015-12-02 11:23:54 +01:00
Marek Posolda	6124fd64f3	Merge pull request #1918 from mposolda/master Fix typos	2015-12-02 10:25:15 +01:00
mposolda	2a03d23098	Fix typos	2015-12-02 08:51:20 +01:00
Stian Thorgersen	ff806eae08	Version bump	2015-12-01 19:54:28 +01:00
Tomas Kyjovsky	e44d6f9888	Merge upstream-master	2015-12-01 17:30:02 +01:00
Tomas Kyjovsky	4e79dde17f	Removed travis profile from arq. testsuite.	2015-12-01 17:29:28 +01:00
Tomas Kyjovsky	29e05ecf0d	Fixed arquillian wait intervals config.	2015-12-01 17:28:28 +01:00
vramik	c4f3bd3dda	Merge upstream/master	2015-12-01 12:51:57 +01:00
Tomas Kyjovsky	ed30c4454a	Increased arquillian timeouts for travis.	2015-11-30 17:09:57 +01:00
Tomas Kyjovsky	0d4771a763	Merge upstream-master	2015-11-30 16:48:25 +01:00
Tomas Kyjovsky	a8317e0cc2	1) Pageload timeout set to 60s. Other timeouts set by arq props in arquillian.xml 2) Refactoring: FlashMessage --> AdminConsoleAlert and AccountManagementAlert	2015-11-30 16:43:18 +01:00
vramik	6a7a823fb4	merge upstream/master	2015-11-30 14:59:44 +01:00
vramik	2e39221b98	added UI tests for clients	2015-11-25 09:27:23 +01:00