Merge pull request #640 from patriot1burke/master

last fixes for rc1

README.md

@@ -1,4 +1,35 @@
 keycloak
 ========
 
-SSO Service for web apps and REST services.
+Please visit [http://keycloak.org](http://keycloak.org) for more information on Keycloak including how to download, documentation,
+and video tutorials.  
+
+Keycloak is an SSO Service for web apps and REST services.
+It can be used for social applications as well as enterprise applications.  It is based on OpenID Connect with SAML support in the works.
+Here's some of the features:
+
+* SSO and Single Log Out for browser applications
+* Social Broker.  Enable Google, Facebook, Yahoo, Twitter social login with no code required.
+* Optional LDAP/Active Directory integration
+* Optional User Registration
+* Password and TOTP support (via Google Authenticator).  Client cert auth coming soon.
+* User session management from both admin and user perspective
+* Customizable themes for user facing pages: login, grant pages, account management, emails, and admin console all customizable!
+* OAuth Bearer token auth for REST Services
+* Integrated Browser App to REST Service token propagation
+* Admin REST API
+* OAuth 2.0 Grant requests
+* CORS Support
+* CORS Web Origin management and validation
+* Completely centrally managed user and role mapping metadata.  Minimal configuration at the application side
+* Admin Console for managing users, roles, role mappings, applications, user sessions, allowed CORS web origins, and OAuth clients.
+* Deployable as a WAR, appliance, or an Openshift  cloud service (SaaS).
+* Supports JBoss AS7, EAP 6.x, and Wildfly applications.   Plans to support Node.js, RAILS, GRAILS, and other non-Java applications.
+* Javascript/HTML 5 adapter for pure Javascript apps
+* Session management from admin console
+* Revocation policies
+* Password policies
+* OpenID Connect Support
+
+Please visit [http://keycloak.org](http://keycloak.org) for more information on Keycloak including how to download, documentation,
+and video tutorials.

audit/api/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-audit-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.0-beta-4</version>
+        <version>1.0-rc-1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

audit/email/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-audit-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.0-beta-4</version>
+        <version>1.0-rc-1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

audit/email/src/main/java/org/keycloak/audit/email/EmailAuditListener.java

@@ -7,8 +7,8 @@ import org.keycloak.audit.EventType;
 import org.keycloak.email.EmailException;
 import org.keycloak.email.EmailProvider;
 import org.keycloak.models.KeycloakSession;
-import org.keycloak.models.RealmProvider;
 import org.keycloak.models.RealmModel;
+import org.keycloak.models.RealmProvider;
 import org.keycloak.models.UserModel;
 
 import java.util.Set;

audit/jboss-logging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-audit-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.0-beta-4</version>
+        <version>1.0-rc-1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

audit/jpa/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-audit-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.0-beta-4</version>
+        <version>1.0-rc-1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

audit/mongo/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-audit-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.0-beta-4</version>
+        <version>1.0-rc-1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

audit/mongo/src/main/java/org/keycloak/audit/mongo/MongoEventQuery.java

@@ -9,7 +9,6 @@ import org.keycloak.audit.EventType;
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>

audit/pom.xml

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

connections/jpa/pom.xml

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

connections/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java

@@ -9,7 +9,6 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
 
 /**
  * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
@@ -69,11 +68,6 @@ public class DefaultJpaConnectionProviderFactory implements JpaConnectionProvide
                             properties.put(AvailableSettings.JDBC_URL, config.get("url"));
                             properties.put(AvailableSettings.JDBC_DRIVER, config.get("driver"));
 
-                            String driverDialect = config.get("driverDialect");
-                            if (driverDialect != null && driverDialect.length() > 0) {
-                                properties.put("hibernate.dialect", driverDialect);
-                            }
-
                             String user = config.get("user");
                             if (user != null) {
                                 properties.put(AvailableSettings.JDBC_USER, user);
@@ -84,6 +78,11 @@ public class DefaultJpaConnectionProviderFactory implements JpaConnectionProvide
                             }
                         }
 
+                        String driverDialect = config.get("driverDialect");
+                        if (driverDialect != null && driverDialect.length() > 0) {
+                            properties.put("hibernate.dialect", driverDialect);
+                        }
+
                         String databaseSchema = config.get("databaseSchema", "validate");
                         if (databaseSchema != null) {
                             properties.put("hibernate.hbm2ddl.auto", databaseSchema);

connections/jpa/src/main/resources/META-INF/persistence.xml

@@ -7,6 +7,7 @@
         <class>org.keycloak.models.jpa.entities.CredentialEntity</class>
         <class>org.keycloak.models.jpa.entities.OAuthClientEntity</class>
         <class>org.keycloak.models.jpa.entities.RealmEntity</class>
+        <class>org.keycloak.models.jpa.entities.RealmAttributeEntity</class>
         <class>org.keycloak.models.jpa.entities.RequiredCredentialEntity</class>
         <class>org.keycloak.models.jpa.entities.UserFederationProviderEntity</class>
         <class>org.keycloak.models.jpa.entities.RoleEntity</class>

connections/mongo/pom.xml

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

connections/mongo/src/main/java/org/keycloak/connections/mongo/MongoKeycloakTransaction.java

@@ -42,11 +42,13 @@ public class MongoKeycloakTransaction implements KeycloakTransaction {
         } catch (MongoException e) {
             throw MongoStoreImpl.convertException(e);
         }
+        started = false;
     }
 
     @Override
     public void rollback() {
         invocationContext.rollback();
+        started = false;
     }
 
     @Override

connections/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.0-beta-4</version>
+        <version>1.0-rc-1</version>
     </parent>
     <name>Connections Parent</name>
     <description/>

core-jaxrs/pom.xml

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

core/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.0-beta-4</version>
+        <version>1.0-rc-1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -13,6 +13,10 @@
     <name>Keycloak Core</name>
     <description/>
 
+    <properties>
+        <timestamp>${maven.build.timestamp}</timestamp>
+        <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -41,6 +45,12 @@
         </dependency>
     </dependencies>
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

core/src/main/java/org/keycloak/Version.java

@@ -0,0 +1,44 @@
+package org.keycloak;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+/**
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+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();
+
+    private final String version = VERSION;
+    private final String buildTime = BUILD_TIME;
+
+    static {
+        Properties props = new Properties();
+        InputStream is = Version.class.getResourceAsStream("/keycloak-version.properties");
+        try {
+            props.load(is);
+            VERSION = props.getProperty("version");
+            BUILD_TIME = props.getProperty("build-time");
+        } catch (IOException e) {
+            VERSION=UNKNOWN;
+            BUILD_TIME=UNKNOWN;
+        }
+    }
+
+    @JsonProperty("version")
+    public String getVersion() {
+        return version;
+    }
+
+    @JsonProperty("build-time")
+    public String getBuildTime() {
+        return buildTime;
+    }
+}

core/src/main/java/org/keycloak/adapters/AdapterConstants.java

@@ -8,6 +8,7 @@ public interface AdapterConstants {
 
     // URL endpoints
     public static final String K_LOGOUT = "k_logout";
+    public static final String K_VERSION = "k_version";
     public static final String K_PUSH_NOT_BEFORE = "k_push_not_before";
     public static final String K_GET_USER_STATS = "k_get_user_stats";
     public static final String K_GET_SESSION_STATS = "k_get_session_stats";

core/src/main/java/org/keycloak/representations/idm/CredentialRepresentation.java

@@ -20,6 +20,8 @@ public class CredentialRepresentation {
     protected String hashedSaltedValue;
     protected String salt;
     protected Integer hashIterations;
+    // only used when updating a credential.  Might set required action
+    protected boolean temporary;
 
     public String getType() {
         return type;
@@ -68,4 +70,12 @@ public class CredentialRepresentation {
     public void setHashIterations(Integer hashIterations) {
         this.hashIterations = hashIterations;
     }
+
+    public boolean isTemporary() {
+        return temporary;
+    }
+
+    public void setTemporary(boolean temporary) {
+        this.temporary = temporary;
+    }
 }

core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java

@@ -52,6 +52,7 @@ public class RealmRepresentation {
     protected Map<String, List<ScopeMappingRepresentation>> applicationScopeMappings;
     protected List<ApplicationRepresentation> applications;
     protected List<OAuthClientRepresentation> oauthClients;
+    protected Map<String, String> browserSecurityHeaders;
     protected Map<String, String> socialProviders;
     protected Map<String, String> smtpServer;
     protected List<UserFederationProviderRepresentation> userFederationProviders;
@@ -291,6 +292,14 @@ public class RealmRepresentation {
         this.updateProfileOnInitialSocialLogin = updateProfileOnInitialSocialLogin;
     }
 
+    public Map<String, String> getBrowserSecurityHeaders() {
+        return browserSecurityHeaders;
+    }
+
+    public void setBrowserSecurityHeaders(Map<String, String> browserSecurityHeaders) {
+        this.browserSecurityHeaders = browserSecurityHeaders;
+    }
+
     public Map<String, String> getSocialProviders() {
         return socialProviders;
     }

core/src/main/java/org/keycloak/representations/idm/UserFederationProviderFactoryRepresentation.java

@@ -1,7 +1,5 @@
 package org.keycloak.representations.idm;
 
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**

core/src/main/java/org/keycloak/representations/idm/UserFederationProviderRepresentation.java

@@ -12,6 +12,9 @@ public class UserFederationProviderRepresentation {
     private String providerName;
     private Map<String, String> config;
     private int priority;
+    private int fullSyncPeriod;
+    private int changedSyncPeriod;
+    private int lastSync;
 
     public String getId() {
         return id;
@@ -54,6 +57,30 @@ public class UserFederationProviderRepresentation {
         this.priority = priority;
     }
 
+    public int getFullSyncPeriod() {
+        return fullSyncPeriod;
+    }
+
+    public void setFullSyncPeriod(int fullSyncPeriod) {
+        this.fullSyncPeriod = fullSyncPeriod;
+    }
+
+    public int getChangedSyncPeriod() {
+        return changedSyncPeriod;
+    }
+
+    public void setChangedSyncPeriod(int changedSyncPeriod) {
+        this.changedSyncPeriod = changedSyncPeriod;
+    }
+
+    public int getLastSync() {
+        return lastSync;
+    }
+
+    public void setLastSync(int lastSync) {
+        this.lastSync = lastSync;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

core/src/main/java/org/keycloak/util/StringPropertyReplacer.java

@@ -21,8 +21,8 @@
   */
 package org.keycloak.util;
 
-import java.util.Properties;
 import java.io.File;
+import java.util.Properties;
 
 /**
  * A utility class for replacing properties in strings. 

core/src/main/resources/keycloak-version.properties

@@ -0,0 +1,2 @@
+version=${project.version}
+build-time=${timestamp}

dependencies/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.0-beta-4</version>
+        <version>1.0-rc-1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

dependencies/server-all/pom.xml

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

dependencies/server-min/pom.xml

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

distribution/appliance-dist/assembly.xml

@@ -53,6 +53,14 @@
             <directory>${project.build.directory}/unpacked/adapter</directory>
             <outputDirectory>keycloak</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/unpacked/js-adapter</directory>
+            <outputDirectory>adapters/js-adapter</outputDirectory>
+            <includes>
+                <include>**/*.js</include>
+                <include>**/*.html</include>
+            </includes>
+        </fileSet>
         <fileSet>
             <directory>src/main/welcome-content</directory>
             <outputDirectory>keycloak/welcome-content</outputDirectory>

distribution/appliance-dist/pom.xml

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

distribution/as7-adapter-zip/pom.xml

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

distribution/eap6-adapter-zip/pom.xml

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

distribution/examples-docs-zip/pom.xml

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

distribution/modules/lib.xml

@@ -20,7 +20,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<project name="module-repository-lib" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="module-repository-lib">
 
     <property name="src.dir" value="src"/>
     <property name="module.repo.src.dir" value="${src.dir}/main/resources/modules"/>

distribution/modules/pom.xml

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

distribution/pom.xml

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

distribution/src-dist/pom.xml

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

distribution/theme-template-zip/pom.xml

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

distribution/war-dist/assembly.xml

@@ -10,6 +10,17 @@
         <fileSet>
             <directory>${project.build.directory}/unpacked</directory>
             <outputDirectory></outputDirectory>
+            <excludes>
+                <exclude>**/js-adapter/**</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/unpacked/js-adapter</directory>
+            <outputDirectory>adapters/js-adapter</outputDirectory>
+            <includes>
+                <include>**/*.js</include>
+                <include>**/*.html</include>
+            </includes>
         </fileSet>
     </fileSets>
     <dependencySets>

distribution/war-dist/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.0-beta-4</version>
+        <version>1.0-rc-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -84,6 +84,12 @@
                                     <type>zip</type>
                                     <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.keycloak</groupId>
+                                    <artifactId>keycloak-js-adapter</artifactId>
+                                    <version>${project.version}</version>
+                                    <outputDirectory>${project.build.directory}/unpacked/js-adapter</outputDirectory>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>

distribution/war-zip/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.0-beta-4</version>
+        <version>1.0-rc-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -48,29 +48,7 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
-            <plugin>
-                <groupId>com.google.code.maven-replacer-plugin</groupId>
-                <artifactId>replacer</artifactId>
-                <version>1.5.2</version>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>replace</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <file>${project.build.directory}/unpacked/deployments/auth-server.war/WEB-INF/classes/META-INF/keycloak-server.json</file>
-                    <replacements>
-                        <replacement>
-                            <token>java:jboss/datasources/ExampleDS</token>
-                            <value>java:jboss/datasources/KeycloakDS</value>
-                        </replacement>
-                    </replacements>
-                </configuration>
-            </plugin>
+            </plugin>            
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.4</version>

distribution/wildfly-adapter-zip/pom.xml

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

docbook/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.keycloak</groupId>
     <artifactId>keycloak-reference-guide-${translation}</artifactId>
-    <version>1.0-beta-4</version>
+    <version>1.0-rc-1</version>
     <packaging>jdocbook</packaging>
     <name>Keycloak Reference Guide (${translation})</name>
     <description/>

docbook/reference/en/en-US/master.xml

@@ -12,6 +12,7 @@
                 <!ENTITY JBossAdapter SYSTEM "modules/jboss-adapter.xml">
                 <!ENTITY JavascriptAdapter SYSTEM "modules/javascript-adapter.xml">
                 <!ENTITY InstalledApplications SYSTEM "modules/installed-applications.xml">
+                <!ENTITY Logout SYSTEM "modules/logout.xml">
                 <!ENTITY SocialConfig SYSTEM "modules/social-config.xml">
                 <!ENTITY SocialFacebook SYSTEM "modules/social-facebook.xml">
                 <!ENTITY SocialGitHub SYSTEM "modules/social-github.xml">
@@ -37,7 +38,7 @@
    <bookinfo>
       <title>Keycloak Reference Guide</title>
       <subtitle>SSO for Web Apps and REST Services</subtitle>
-      <releaseinfo>1.0-beta-4</releaseinfo>
+      <releaseinfo>1.0-rc-1</releaseinfo>
    </bookinfo>
 
    <toc/>
@@ -80,6 +81,7 @@ This one is short
         &JBossAdapter;
         &JavascriptAdapter;
         &InstalledApplications;
+        &Logout;
     </chapter>
 
     <chapter>

docbook/reference/en/en-US/modules/License.xml

@@ -1,6 +1,6 @@
 <chapter id="license">
     <title>License</title>
-    <para>Keycloak is distributed under the ASL 2.0 license. It does not distribute any thirdparty libraries that are
+    <para>Keycloak codebase is distributed under the ASL 2.0 license. It does not distribute any thirdparty libraries that are
         GPL. It does ship thirdparty libraries licensed under
         Apache ASL 2.0 and LGPL.
     </para>

docbook/reference/en/en-US/modules/MigrationFromOlderVersions.xml

@@ -1,5 +1,16 @@
 <chapter id="Migration_from_older_versions">
     <title>Migration from older versions</title>
+    <sect1>
+        <title>Migrating from 1.0 Beta 4 to RC-1</title>
+        <itemizedlist>
+            <listitem>
+                logout REST API has been refactored.  The GET request on the logout URI does not take a session_state
+                parameter anymore.  You must be logged in in order to log out the session.
+                You can also POST to the logout REST URI.  This action requires a valid refresh token to perform the logout.
+                The signature is the same as refresh token minus the grant type form parameter.  See documentation for details.
+            </listitem>
+         </itemizedlist>
+    </sect1>
     <sect1>
         <title>Migrating from 1.0 Beta 1 to Beta 4</title>
         <itemizedlist>

docbook/reference/en/en-US/modules/direct-access.xml

@@ -88,7 +88,7 @@ try {
    if (isPublic()) { // if client is public access type
        formparams.add(new BasicNameValuePair(OAuth2Constants.CLIENT_ID, "customer-portal"));
    } else {
-       String authorization = BasicAuthHelper.createHeader("customer-portal", "secret-secret-secret);
+       String authorization = BasicAuthHelper.createHeader("customer-portal", "secret-secret-secret");
        post.setHeader("Authorization", authorization);
    }
    UrlEncodedFormEntity form = new UrlEncodedFormEntity(formparams, "UTF-8");
@@ -125,4 +125,36 @@ GET /my/rest/api
 Authorization: Bearer 2YotnFZFEjr1zCsicMWpAA
 </programlisting>
     </para>
+    <para>
+        To logout you must use the refresh token contained in the AccessTokenResponse object.
+    </para>
+<programlisting>
+    <![CDATA[
+List<NameValuePair> formparams = new ArrayList<NameValuePair>();
+if (isPublic()) { // if client is public access type
+    formparams.add(new BasicNameValuePair(OAuth2Constants.CLIENT_ID, "customer-portal"));
+} else {
+    String authorization = BasicAuthHelper.createHeader("customer-portal", "secret-secret-secret");
+    post.setHeader("Authorization", authorization);
+}
+formparams.add(new BasicNameValuePair(OAuth2Constants.REFRESH_TOKEN, tokenResponse.getRefreshToken()));
+HttpResponse response = null;
+URI logoutUri = KeycloakUriBuilder.fromUri(getBaseUrl(request) + "/auth")
+                    .path(ServiceUrlConstants.TOKEN_SERVICE_LOGOUT_PATH)
+                    .build("demo");
+HttpPost post = new HttpPost(logoutUri);
+UrlEncodedFormEntity form = new UrlEncodedFormEntity(formparams, "UTF-8");
+post.setEntity(form);
+response = client.execute(post);
+int status = response.getStatusLine().getStatusCode();
+HttpEntity entity = response.getEntity();
+if (status != 204) {
+   error(status, entity);
+}
+if (entity == null) {
+   return;
+}
+InputStream is = entity.getContent();
+if (is != null) is.close();
+]]></programlisting>
 </chapter>

docbook/reference/en/en-US/modules/export-import.xml

@@ -47,6 +47,14 @@ bin/standalone.sh -Dkeycloak.migration.action=export
         <programlisting><![CDATA[
 bin/standalone.sh -Dkeycloak.migration.action=export
 -Dkeycloak.migration.provider=singleFile -Dkeycloak.migration.file=<FILE TO EXPORT TO>
+]]></programlisting>
+    </para>
+    <para>
+        Here's an example of importing:
+        <programlisting><![CDATA[
+bin/standalone.sh -Dkeycloak.migration.action=import
+-Dkeycloak.migration.provider=singleFile -Dkeycloak.migration.file=<FILE TO IMPORT>
+-Dkeycloak.migration.strategy=OVERWRITE_EXISTING
 ]]></programlisting>
     </para>
     <para>
@@ -92,7 +100,7 @@ bin/standalone.sh -Dkeycloak.migration.action=export
                         is used during import. It can be used to specify how to proceed if realm with same name
                         already exists in the database where you are going to import data. Possible values are:
                         <itemizedlist>
-                            <listitem>IGNORE_EXISTING - Ignore exporting if realm of this name already exists</listitem>
+                            <listitem>IGNORE_EXISTING - Ignore importing if realm of this name already exists</listitem>
                             <listitem>OVERWRITE_EXISTING - Remove existing realm and import it again with new data from JSON file.
                                 If you want to fully migrate one environment to another and ensure that the new environment will contain same data
                                 like the old one, you can specify this.

docbook/reference/en/en-US/modules/jboss-adapter.xml

@@ -1,4 +1,4 @@
-<section>
+<section id="jboss-adapter">
     <title>JBoss/Wildfly Adapter</title>
     <para>
         To be able to secure WAR apps deployed on JBoss AS 7.1.1, JBoss EAP 6.x, or Wildfly, you must install and
@@ -7,7 +7,7 @@
         to crack open your WARs at all and can apply Keycloak via the Keycloak Subsystem configuration in standalone.xml.
         Both methods are described in this section.
     </para>
-    <section>
+    <section id="jboss-adapter-installation">
         <title>Adapter Installation</title>
     <para>
         This is a adapter zip file for AS7, EAP, and Wildfly in the <literal>adapters/</literal> directory in the Keycloak

docbook/reference/en/en-US/modules/logout.xml

@@ -0,0 +1,9 @@
+<section>
+    <title>Logout</title>
+    <para>
+        There are multiple ways you can logout from a web application.  For Java EE servlet containers, you can call
+        HttpServletRequest.logout().
+        For any other browser application, you can point the browser at the url <literal>http://auth-server/auth/realms/{realm-name}/tokens/logout?redirect_uri=encodedRedirectUri</literal>.
+        This will log you out if you have an SSO session with your browser.
+    </para>
+</section>

docbook/reference/en/en-US/modules/server-installation.xml

@@ -8,11 +8,11 @@
         <itemizedlist>
 
             <listitem>
-                keycloak-appliance-dist-all-1.0-beta-4.zip
+                keycloak-appliance-dist-all-1.0-rc-1.zip
             </listitem>
 
             <listitem>
-                keycloak-war-dist-all-1.0-beta-4.zip
+                keycloak-war-dist-all-1.0-rc-1.zip
             </listitem>
 
         </itemizedlist>
@@ -31,7 +31,7 @@
 
         <para>
 <programlisting>
-keycloak-appliance-dist-all-1.0-beta-4/
+keycloak-appliance-dist-all-1.0-rc-1/
     keycloak/
         bin/
             standalone.sh
@@ -42,9 +42,9 @@ keycloak-appliance-dist-all-1.0-beta-4/
                 keycloak-server.json
                 themes/
     adapters/
-        keycloak-as7-adapter-dist-1.0-beta-4.zip
-        keycloak-eap6-adapter-dist-1.0-beta-4.zip
-        keycloak-wildfly-adapter-dist-1.0-beta-4.zip
+        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
     examples/
     docs/
 </programlisting>
@@ -79,7 +79,7 @@ keycloak-appliance-dist-all-1.0-beta-4/
         </para>
         <para>
 <programlisting>
-keycloak-war-dist-all-1.0-beta-4/
+keycloak-war-dist-all-1.0-rc-1/
     deployments/
         auth-server.war/
         keycloak-ds.xml
@@ -87,9 +87,9 @@ keycloak-war-dist-all-1.0-beta-4/
         keycloak-server.json
         themes/
     adapters/
-        keycloak-as7-adapter-dist-1.0-beta-4.zip
-        keycloak-eap6-adapter-dist-1.0-beta-4.zip
-        keycloak-wildfly-adapter-dist-1.0-beta-4.zip
+        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
     examples/
     docs/
 </programlisting>
@@ -101,10 +101,16 @@ keycloak-war-dist-all-1.0-beta-4/
         </para>
         <para>
 <programlisting>
-    $ cd keycloak-war-dist-all-1.0-beta-4
+    $ cd keycloak-war-dist-all-1.0-rc-1
     $ cp -r deployments $JBOSS_HOME/standalone
+    $ cp -r configuration $JBOSS_HOME/standalone
 </programlisting>
         </para>
+        <para>
+            After these steps you should also <link linkend='jboss-adapter-installation'>install the client adapter</link>
+            as this may contain modules the server needs (like Bouncycastle).  You will also need to install the adapter
+            to run the examples on the same server.
+        </para>
         <para>
             After booting up the JBoss or Wildfly distro, you can then make sure it is installed properly
             by logging into the admin console at<ulink
@@ -136,9 +142,9 @@ keycloak-war-dist-all-1.0-beta-4/
             </itemizedlist>
         </para>
         <section>
-            <title>Database Configuration</title>
+            <title>Relational Database Configuration</title>
             <para>
-                The datasource used to store Keycloak data is configured in the <literal>.../standalone/deployments/keycloak-ds.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.
@@ -188,22 +194,87 @@ keycloak-war-dist-all-1.0-beta-4/
             </para>
             <para>
                 Keycloak also runs on a Hibernate/JPA backend which is configured in the
-                <literal>.../standalone/deployments/auth-server.war/WEB-INF/classes/META-INF/persistence.xml</literal>.
-                Please see the <ulink url="http://hibernate.org/orm/documentation/">Hibernate and JPA documentation</ulink> for more information on tweaking the backend datamodel.
+                <literal>standalone/configuration/keycloak-server.json</literal>.
+                By default the setting is like this:
+                <programlisting><![CDATA[
+"connectionsJpa": {
+    "default": {
+        "dataSource": "java:jboss/datasources/KeycloakDS",
+        "databaseSchema": "update"
+    }
+},
+]]></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>
+                            <para>
+                                JNDI name of the dataSource
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>jta</term>
+                        <listitem>
+                            <para>
+                                boolean property to specify if datasource is JTA capable
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>driverDialect</term>
+                        <listitem>
+                            <para>
+                                Value of Hibernate dialect. In most cases you don't need to specify this property as dialect will be
+                                autodetected by Hibernate.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>databaseSchema</term>
+                        <listitem>
+                            <para>
+                                Value of database schema (Hibernate property "hibernate.hbm2ddl.auto" ).
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>showSql</term>
+                        <listitem>
+                            <para>
+                                Specify whether Hibernate should show all SQL commands in the console (false by default)
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>formatSql</term>
+                        <listitem>
+                            <para>
+                                Specify whether Hibernate should format SQL commands (true by default)
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                </variablelist>
+                For more info about Hibernate properties, see <ulink url="http://hibernate.org/orm/documentation/">Hibernate and JPA documentation</ulink> .
             </para>
             <section>
                 <title>Tested databases</title>
                 <para>
                     Here is list of RDBMS databases and corresponding JDBC drivers, which were tested with Keycloak. Note that Hibernate dialect
                     is usually set automatically according to your database, but in some cases, you must manually set the proper dialect,
-                    as the default dialect may not work correctly. You can setup dialect either by adding property <literal>hibernate.dialect</literal>
-                    to the <literal>persistence.xml</literal> file mentioned above or simply by adding system property <literal>hibernate.dialect</literal>
-                    with corresponding value. For example, if you are using MS-SQL you can start keycloak with command:
-<programlisting><![CDATA[
-./standalone.sh -Dhibernate.dialect=org.hibernate.dialect.SQLServer2008Dialect
-]]></programlisting>
-                    This command will set system property <literal>hibernate.dialect</literal> to value <literal>org.hibernate.dialect.SQLServer2008Dialect</literal>
-                    and this one will take precedence over the value from <literal>persistence.xml</literal> file.
+                    as the default dialect may not work correctly. You can setup dialect by adding property <literal>driverDialect</literal>
+                    to the <literal>keycloak-server.json</literal> into <literal>connectionsJpa</literal> section (see above).
                     <table frame='all'><title>Tested databases</title>
                         <tgroup cols='3' align='left' colsep='1' rowsep='1'>
                             <thead>
@@ -259,14 +330,18 @@ keycloak-war-dist-all-1.0-beta-4/
 
 <programlisting><![CDATA[
 "audit": {
-  "provider": "jpa",
-  "jpa": {
-    "exclude-events": [ "REFRESH_TOKEN" ]
-  }
+    "provider": "jpa",
+    "jpa": {
+        "exclude-events": [ "REFRESH_TOKEN" ]
+    }
 },
 
-"model": {
-  "provider": "jpa"
+"realm": {
+    "provider": "jpa"
+},
+
+"user": {
+    "provider": "${keycloak.user.provider:jpa}"
 },
 ]]></programlisting>
 
@@ -274,39 +349,33 @@ keycloak-war-dist-all-1.0-beta-4/
 
                 <programlisting><![CDATA[
 "audit": {
-  "provider": "mongo",
-  "mongo": {
-    "exclude-events": [ "REFRESH_TOKEN" ],
-    "host": "<hostname>",
-    "port": <port>,
-    "user": "<user>",
-    "password": "<password>",
-    "db": "<db name>"
-  }
+    "provider": "mongo",
 },
 
-"model": {
-  "provider": "mongo",
-  "mongo": {
-    "host": "<hostname>",
-    "port": <port>,
-    "user": "<user>",
-    "password": "<password>",
-    "db": "<db name>"
-  }
+"realm": {
+    "provider": "mongo"
 },
+
+"user": {
+    "provider": "mongo"
+}
 ]]></programlisting>
 
-                All configuration options are optional. Default values for host and port are localhost and 27017. If
-                user and password are not specified Keycloak will connect unauthenticated to your MongoDB. Finally, default
-                values for db are keycloak for the model, and keycloak-audit for audit.
+                And at the end of the file add the snippet like this where you can configure details about your Mongo database:
+                <programlisting><![CDATA[
+"connectionsMongo": {
+    "default": {
+        "host": "127.0.0.1",
+        "port": "27017",
+        "db": "keycloak"
+    }
+}
+]]></programlisting>
 
-                If you switch to Mongo model, it could be a good idea to remove RDBMS related stuff from your distribution to reduce startup time and memory footprint.
-                To do it, you need to:
-                <itemizedlist>
-                    <listitem>Comment/remove datasource <literal>KeycloakDS</literal> from <literal>standalone/configuration/standalone.xml</literal> or <literal>standalone/deployments/keycloak-ds.xml</literal></listitem>
-                    <listitem>Remove file <literal>standalone/deployments/auth-server.war/WEB-INF/classes/META-INF/persistence.xml</literal></listitem>
-                </itemizedlist>
+                All configuration options are optional. Default values for host and port are localhost and 27017. Default name of database
+                is <literal>keycloak</literal> . You can also specify properties <literal>user</literal> and <literal>password</literal>
+                if you want authenticate against your MongoDB. If user and password are not specified, Keycloak will connect
+                unauthenticated to your MongoDB.
             </para>
         </section>
 
@@ -333,7 +402,7 @@ keycloak-war-dist-all-1.0-beta-4/
 </programlisting>
         </section>
         <section>
-            <title>SSL/HTTPS Setup</title>
+            <title>SSL/HTTPS Requirement/Modes</title>
             <warning>
                 <para>
                     Keycloak is not set up by default to handle SSL/HTTPS in either the
@@ -341,6 +410,47 @@ keycloak-war-dist-all-1.0-beta-4/
                     itself or on a reverse proxy in front of the Keycloak server.
                 </para>
             </warning>
+            <para>
+                Keycloak can run out of the box without SSL so long as you stick to private IP addresses like
+                localhost, 127.0.0.1, 10.0.x.x, 192.168.x.x, and 172..16.x.x.  If you try to access Keycloak from a
+                non-IP adress you will get an error.
+            </para>
+            <para>
+                Keycloak has 3 SSL/HTTPS modes which you can set up in the admin console under the Settings->Login page
+                and the <literal>Require SSL</literal> select box.  Each adapter config should mirror this server-side
+                setting.  See adapter config section for more details.
+                <variablelist>
+                    <varlistentry>
+                        <term>external</term>
+                        <listitem>
+                            <para>
+                                Keycloak can run out of the box without SSL so long as you stick to private IP addresses like
+                                localhost, 127.0.0.1, 10.0.x.x, 192.168.x.x, and 172..16.x.x.  If you try to access Keycloak from a
+                                non-IP adress you will get an error.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>none</term>
+                        <listitem>
+                            <para>
+                                Keycloak does not require SSL.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                    <varlistentry>
+                        <term>all</term>
+                        <listitem>
+                            <para>
+                                Keycloak requires SSL for all IP addresses.
+                            </para>
+                        </listitem>
+                    </varlistentry>
+                </variablelist>
+            </para>
+        </section>
+        <section>
+            <title>SSL/HTTPS Setup</title>
 
             <para>
                 First enable SSL on Keycloak or on a reverse proxy in front of Keycloak. Then configure the Keycloak Server to enforce HTTPS connections.

docbook/reference/en/en-US/modules/social-facebook.xml

@@ -18,7 +18,8 @@
         </listitem>
         <listitem>
             <para>
-                Once the app has been created click on <literal>Settings</literal> in sidebar on the left. Then click
+                Once the app has been created click on <literal>Settings</literal> in sidebar on the left. You must specify
+                a contact email.  Save your changes.  Then click
                 on <literal>Advanced</literal>. Under <literal>Security</literal> make sure
                 <literal>Client OAuth Login</literal> is enabled. In <literal>Valid OAuth redirect URIs</literal> insert
                 the <link linkend="social-callbackurl">social callback url</link>. Scroll down and click on the
@@ -28,7 +29,8 @@
         <listitem>
             <para>
                 Click <literal>Status &amp; Review</literal> and select <literal>YES</literal> for <literal>Do you want
-                to make this app and all its live features available to the general public?</literal>.
+                to make this app and all its live features available to the general public?</literal>.  You will
+                not be able to set this until you have provided a contact email in the general settings of this application.
             </para>
         </listitem>
         <listitem>

docbook/reference/en/en-US/modules/social-github.xml

@@ -1,7 +1,7 @@
 <section id="social-github">
     <title>GitHub</title>
     <para>
-        To enable login with Google you first have to create an application in
+        To enable login with GitHub you first have to create an application in
         <ulink url="https://github.com/settings/applications">GitHub Settings</ulink>. Then you need to copy
         the client id and secret into the Keycloak Admin Console.
     </para>

docbook/reference/en/en-US/modules/social-twitter.xml

@@ -22,7 +22,7 @@
         </listitem>
         <listitem>
             <para>
-                Now click <literal>Details</literal>. Copy <literal>Consumer key</literal> and <literal>Consumer secret</literal> from the
+                Now click <literal>API Keys</literal> tab. Copy <literal>API key</literal> and <literal>API secret</literal> from the
                 <ulink url="https://dev.twitter.com/apps">Twitter Developer Console</ulink> into the settings
                 page in the Keycloak Admin Console as the <literal>Key</literal> and <literal>Secret</literal>. Then click
                 <literal>Save</literal> in the Keycloak Admin Console to enable login with Twitter.

docbook/reference/en/en-US/modules/themes.xml

@@ -154,7 +154,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-beta-4.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-1.0-rc-1.jar</literal>
                 or disable it with the system property <literal>org.keycloak.account.freemarker.FreeMarkerAccountProviderFactory</literal>.
             </para>
         </section>
@@ -167,7 +167,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-beta-4.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-1.0-rc-1.jar</literal>
                 or disable it with the system property <literal>org.keycloak.login.freemarker.FreeMarkerLoginFormsProviderFactory</literal>.
             </para>
         </section>

docbook/reference/en/en-US/modules/timeouts.xml

@@ -1,4 +1,4 @@
-<chapter id="timeouts">
+    <chapter id="timeouts">
     <title>Cookie settings, Session Timeouts, and Token Lifespans</title>
     <para>
         Keycloak has a bunch of fine-grain settings to manage browser cookies, user login sessions, and token lifespans.
@@ -43,11 +43,11 @@
             application not knowing if the user's permissions have changed.  This value is usually in minutes.
         </para>
         <para>
-            The <literal>Access Code Lifespan</literal> is how long an access code is valid for.  An access code is obtained
+            The <literal>Client login timeout</literal> is how long an access code is valid for.  An access code is obtained
             on the 1st leg of the OAuth 2.0 redirection protocol.  This should be a short time limit.  Usually seconds.
         </para>
         <para>
-            The <literal>Access Code Action Lifespan</literal> is how long a user is allowed to attempt a login.  When a user tries
+            The <literal>Login user action lifespan</literal> is how long a user is allowed to attempt a login.  When a user tries
             to login, they may have to change their password, set up TOTP, or perform some other action before they are redirected
             back to your application as an authentnicated user.  This value is relatively short and is usually measured in minutes.
         </para>

docbook/reference/en/en-US/modules/user-federation.xml

@@ -11,7 +11,7 @@
         Most of the time when you want to federate an external user store, much of the metadata that would be needed to
         provide this complete feature set does not exist in that external store.  For example your LDAP server may only
         provide password validation, but not support TOTP or user role mappings.  The Keycloak User Federation SPI was
-        written to support these completely variable locations
+        written to support these completely variable configurations.
     </para>
     <para>
         The way user federation works is that Keycloak will import your federated users on demand to its local storage.  How

examples/cors/angular-product-app/pom.xml

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

examples/cors/database-service/pom.xml

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

examples/cors/database-service/src/main/webapp/WEB-INF/keycloak.json

@@ -1,5 +1,5 @@
 {
-  "realm" : "cors-realm",
+  "realm" : "cors",
   "resource" : "cors-database-service",
   "realm-public-key" : "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQAB",
   "bearer-only" : true,

examples/cors/pom.xml

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

examples/demo-template/README.md

@@ -15,6 +15,7 @@ machine on the network or Internet.
 * **customer-app-cli** A pure CLI application that does remote login using OAuth2 browser redirects with the auth server
 * **product-app** A WAR application that does remote login using OAuth2 browser redirects with the auth server
 * **admin-access-app** A WAR application that does remote REST login to admin console to obtain a list of realm roles from Admin REST API
+* **angular-product-app** An Angular JS pure HTML5/Javascript application.
 * **database-service** JAX-RS services authenticated by bearer tokens only. The customer and product app invoke on it to get data
 * **third-party** Simple WAR that obtain a bearer token using OAuth2 using browser redirects to the auth-server.
 * **third-party-cdi** Simple CDI/JSF WAR that obtain a bearer token using OAuth2 using browser redirects to the auth-server.
@@ -187,6 +188,24 @@ then using that token to access the Admin REST API.
 If you are already logged in, you will not be asked for a username and password, but you will be redirected to
 an oauth grant page.  This page asks you if you want to grant certain permissions to the third-part app.
 
+Step 9: Angular JS Example
+----------------------------------
+An Angular JS example using Keycloak to secure it.
+
+[http://localhost:8080/angular-product](http://localhost:8080/angular-product)
+
+If you are already logged in, you will not be asked for a username and password, but you will be redirected to
+an oauth grant page.  This page asks you if you want to grant certain permissions to the third-part app.
+
+Step 9: Pure HTML5/Javascript Example
+----------------------------------
+An pure HTML5/Javascript example using Keycloak to secure it.
+
+[http://localhost:8080/customer-portal-js](http://localhost:8080/customer-portal-js)
+
+If you are already logged in, you will not be asked for a username and password, but you will be redirected to
+an oauth grant page.  This page asks you if you want to grant certain permissions to the third-part app.
+
 Admin Console
 ==========================
 

examples/demo-template/admin-access-app/pom.xml

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

examples/demo-template/admin-access-app/src/main/java/org/keycloak/example/AdminClient.java

@@ -44,6 +44,28 @@ public class AdminClient {
         }
     }
 
+    public static String getContent(HttpEntity entity) throws IOException {
+        if (entity == null) return null;
+        InputStream is = entity.getContent();
+        try {
+            ByteArrayOutputStream os = new ByteArrayOutputStream();
+            int c;
+            while ((c = is.read()) != -1) {
+                os.write(c);
+            }
+            byte[] bytes = os.toByteArray();
+            String data = new String(bytes);
+            return data;
+        } finally {
+            try {
+                is.close();
+            } catch (IOException ignored) {
+
+            }
+        }
+
+    }
+
     public static AccessTokenResponse getToken(HttpServletRequest request) throws IOException {
 
         HttpClient client = new HttpClientBuilder()
@@ -64,32 +86,14 @@ public class AdminClient {
             int status = response.getStatusLine().getStatusCode();
             HttpEntity entity = response.getEntity();
             if (status != 200) {
-                throw new IOException("Bad status: " + status);
+                String json = getContent(entity);
+                throw new IOException("Bad status: " + status + " response: " + json);
             }
             if (entity == null) {
                 throw new IOException("No Entity");
             }
-            InputStream is = entity.getContent();
-            try {
-                ByteArrayOutputStream os = new ByteArrayOutputStream();
-                int c;
-                while ((c = is.read()) != -1) {
-                    os.write(c);
-                }
-                byte[] bytes = os.toByteArray();
-                String json = new String(bytes);
-                try {
-                    return JsonSerialization.readValue(json, AccessTokenResponse.class);
-                } catch (IOException e) {
-                    throw new IOException(json, e);
-                }
-            } finally {
-                try {
-                    is.close();
-                } catch (IOException ignored) {
-
-                }
-            }
+            String json = getContent(entity);
+            return JsonSerialization.readValue(json, AccessTokenResponse.class);
         } finally {
             client.getConnectionManager().shutdown();
         }
@@ -102,17 +106,25 @@ public class AdminClient {
 
 
         try {
-            HttpGet get = new HttpGet(KeycloakUriBuilder.fromUri(getBaseUrl(request) + "/auth")
+            HttpPost post = new HttpPost(KeycloakUriBuilder.fromUri(getBaseUrl(request) + "/auth")
                     .path(ServiceUrlConstants.TOKEN_SERVICE_LOGOUT_PATH)
-                    .queryParam("session_state", res.getSessionState())
                     .build("demo"));
-            HttpResponse response = client.execute(get);
+            List<NameValuePair> formparams = new ArrayList<NameValuePair>();
+            formparams.add(new BasicNameValuePair(OAuth2Constants.REFRESH_TOKEN, res.getRefreshToken()));
+            formparams.add(new BasicNameValuePair(OAuth2Constants.CLIENT_ID, "admin-client"));
+            UrlEncodedFormEntity form = new UrlEncodedFormEntity(formparams, "UTF-8");
+            post.setEntity(form);
+            HttpResponse response = client.execute(post);
+            boolean status = response.getStatusLine().getStatusCode() != 204;
             HttpEntity entity = response.getEntity();
             if (entity == null) {
                 return;
             }
             InputStream is = entity.getContent();
             if (is != null) is.close();
+            if (status) {
+                throw new RuntimeException("failed to logout");
+            }
         } finally {
             client.getConnectionManager().shutdown();
         }

examples/demo-template/admin-access-app/src/main/webapp/admin/admin.jsp

@@ -1,6 +1,6 @@
-<%@ page import="org.keycloak.representations.idm.RoleRepresentation" %>
 <%@ page import="org.keycloak.example.AdminClient" %>
 <%@ page import="org.keycloak.representations.AccessTokenResponse" %>
+<%@ page import="org.keycloak.representations.idm.RoleRepresentation" %>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
          pageEncoding="ISO-8859-1" %>
 <html>

examples/demo-template/angular-product-app/pom.xml

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

examples/demo-template/customer-app-cli/pom.xml

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

examples/demo-template/customer-app-cli/src/main/java/org/keycloak/example/CustomerCli.java

@@ -13,7 +13,6 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
 /**

examples/demo-template/customer-app-js/pom.xml

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

examples/demo-template/customer-app/pom.xml

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

examples/demo-template/customer-app/src/main/java/org/keycloak/example/AdminClient.java

@@ -6,7 +6,6 @@ import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.keycloak.KeycloakSecurityContext;
 import org.keycloak.adapters.HttpClientBuilder;
-import org.keycloak.representations.IDToken;
 import org.keycloak.representations.idm.RoleRepresentation;
 import org.keycloak.util.JsonSerialization;
 

examples/demo-template/customer-app/src/main/webapp/admin/admin.jsp

@@ -1,5 +1,5 @@
-<%@ page import="org.keycloak.representations.idm.RoleRepresentation" %>
 <%@ page import="org.keycloak.example.AdminClient" %>
+<%@ page import="org.keycloak.representations.idm.RoleRepresentation" %>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
          pageEncoding="ISO-8859-1" %>
 <html>

examples/demo-template/customer-app/src/main/webapp/customers/view.jsp

@@ -1,9 +1,9 @@
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
          pageEncoding="ISO-8859-1" %>
-<%@ page import="org.keycloak.example.CustomerDatabaseClient" %>
-<%@ page import="org.keycloak.util.KeycloakUriBuilder" %>
-<%@ page import="org.keycloak.representations.IDToken" %>
 <%@ page import="org.keycloak.ServiceUrlConstants" %>
+<%@ page import="org.keycloak.example.CustomerDatabaseClient" %>
+<%@ page import="org.keycloak.representations.IDToken" %>
+<%@ page import="org.keycloak.util.KeycloakUriBuilder" %>
 <html>
 <head>
     <title>Customer View Page</title>

examples/demo-template/database-service/pom.xml

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

examples/demo-template/example-ear/pom.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>keycloak-parent</artifactId>
+        <groupId>org.keycloak</groupId>
+        <version>1.0-rc-1</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.keycloak.example.demo</groupId>
+    <artifactId>customer-portal-example-ear</artifactId>
+    <packaging>ear</packaging>
+    <name>EAR example</name>
+    <description>EAR contains customer and product portals.</description>
+
+    <repositories>
+        <repository>
+            <id>jboss</id>
+            <name>jboss repo</name>
+            <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.keycloak.example.demo</groupId>
+            <artifactId>customer-portal-example</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.keycloak.example.demo</groupId>
+            <artifactId>product-portal-example</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>example-portal</finalName>
+        <plugins>
+            <plugin>
+                <artifactId>maven-ear-plugin</artifactId>
+                <version>2.9.1</version>
+                <configuration>
+                    <modules>
+                        <webModule>
+                            <groupId>org.keycloak.example.demo</groupId>
+                            <artifactId>customer-portal-example</artifactId>
+                            <uri>customer-portal.war</uri>
+                            <contextRoot>/customer-portal</contextRoot>
+                        </webModule>
+                        <webModule>
+                            <groupId>org.keycloak.example.demo</groupId>
+                            <artifactId>product-portal-example</artifactId>
+                            <uri>product-portal.war</uri>
+                            <contextRoot>/product-portal</contextRoot>
+                        </webModule>
+                    </modules>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

examples/demo-template/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>keycloak-parent</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.0-beta-4</version>
+        <version>1.0-rc-1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <name>Examples</name>
@@ -30,6 +30,7 @@
         <module>customer-app-cli</module>
         <module>customer-app-js</module>
         <module>product-app</module>
+        <module>example-ear</module>
         <module>admin-access-app</module>
         <module>angular-product-app</module>
         <module>database-service</module>

examples/demo-template/product-app/pom.xml

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

examples/demo-template/product-app/src/main/webapp/products/servlet-logout.jsp

@@ -1,15 +1,12 @@
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
          pageEncoding="ISO-8859-1"%>
-<%@ page import="org.keycloak.example.oauth.ProductDatabaseClient" %>
-<%@ page import="org.keycloak.util.KeycloakUriBuilder" %>
-<%@ page import="org.keycloak.ServiceUrlConstants" %>
 <html>
 <head>
     <title>Servlet Logout</title>
 </head>
 <body bgcolor="#F5F6CE">
 Performs a servlet logout
-    <%
+<%
     request.logout();
 %>
 </body>

examples/demo-template/product-app/src/main/webapp/products/view.jsp

@@ -1,8 +1,8 @@
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
  pageEncoding="ISO-8859-1"%>
+<%@ page import="org.keycloak.ServiceUrlConstants" %>
 <%@ page import="org.keycloak.example.oauth.ProductDatabaseClient" %>
 <%@ page import="org.keycloak.util.KeycloakUriBuilder" %>
-<%@ page import="org.keycloak.ServiceUrlConstants" %>
 <html>
 <head>
     <title>Product View Page</title>

examples/demo-template/third-party-cdi/pom.xml

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

examples/demo-template/third-party-cdi/src/main/java/org/keycloak/example/oauth/AppContextListener.java

@@ -1,18 +1,17 @@
 package org.keycloak.example.oauth;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
+import org.jboss.logging.Logger;
+import org.keycloak.servlet.ServletOAuthClient;
+import org.keycloak.servlet.ServletOAuthClientBuilder;
 
 import javax.inject.Inject;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.servlet.annotation.WebListener;
-
-import org.jboss.logging.Logger;
-import org.keycloak.servlet.ServletOAuthClient;
-import org.keycloak.servlet.ServletOAuthClientBuilder;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

examples/demo-template/third-party-cdi/src/main/java/org/keycloak/example/oauth/CDIResourcesProducer.java

@@ -1,5 +1,7 @@
 package org.keycloak.example.oauth;
 
+import org.keycloak.servlet.ServletOAuthClient;
+
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Produces;
@@ -7,8 +9,6 @@ import javax.faces.context.FacesContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.keycloak.servlet.ServletOAuthClient;
-
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
  */

examples/demo-template/third-party-cdi/src/main/java/org/keycloak/example/oauth/RefreshTokenFilter.java

@@ -1,7 +1,8 @@
 package org.keycloak.example.oauth;
 
-import java.io.IOException;
-import java.util.Map;
+import org.keycloak.OAuth2Constants;
+import org.keycloak.adapters.ServerRequest;
+import org.keycloak.servlet.ServletOAuthClient;
 
 import javax.inject.Inject;
 import javax.servlet.Filter;
@@ -13,10 +14,8 @@ import javax.servlet.ServletResponse;
 import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
-import org.keycloak.OAuth2Constants;
-import org.keycloak.adapters.ServerRequest;
-import org.keycloak.servlet.ServletOAuthClient;
+import java.io.IOException;
+import java.util.Map;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

examples/demo-template/third-party-cdi/src/main/java/org/keycloak/example/oauth/ServletRequestQualifier.java

@@ -1,12 +1,11 @@
 package org.keycloak.example.oauth;
 
+import javax.inject.Qualifier;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.inject.Qualifier;
-
 /**
  * This is needed to have same code working in AS7 and Wildfly. In Wildfly is HttpServletRequest injected automatically, in AS7 it's not
  *

examples/demo-template/third-party-cdi/src/main/java/org/keycloak/example/oauth/UserData.java

@@ -1,10 +1,9 @@
 package org.keycloak.example.oauth;
 
-import java.io.Serializable;
-import java.util.List;
-
 import javax.enterprise.context.SessionScoped;
 import javax.inject.Named;
+import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>

examples/demo-template/third-party-cdi/src/main/webapp/WEB-INF/faces-config.xml

@@ -17,7 +17,7 @@ limitations under the License.
 -->
 <!-- Marker file indicating JSF should be enabled -->
 <faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:xi="http://www.w3.org/2001/XInclude"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd">
 
 </faces-config>

examples/demo-template/third-party-cdi/src/main/webapp/client.xhtml

@@ -1,8 +1,9 @@
 <!DOCTYPE html
         PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html"
+        >
     <body>
         <h1>Third Party App That Pulls Data Using OAuth</h1>
         <h:form>

examples/demo-template/third-party/pom.xml

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

examples/demo-template/third-party/src/main/java/org/keycloak/example/oauth/Bootstrap.java

@@ -6,11 +6,9 @@ import org.keycloak.servlet.ServletOAuthClientBuilder;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
-import java.security.KeyStore;
 
 /**
  * Init code to load up the truststore so we can make appropriate SSL connections

examples/js-console/pom.xml

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

examples/pom.xml

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

examples/providers/audit-listener-sysout/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>examples-providers-pom</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.0-beta-4</version>
+        <version>1.0-rc-1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>Audit Listener System.out Example</name>

examples/providers/audit-provider-mem/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>examples-providers-pom</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.0-beta-4</version>
+        <version>1.0-rc-1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>Audit Provider In-Mem Example</name>

examples/providers/federation-provider/README.md

@@ -3,14 +3,14 @@ Example User Federation Provider
 
 This is an example of user federation backed by a simple properties file.  This properties file only contains username/password
 key pairs.  To deploy, build this directory then take the jar and copy it to the WEB-INF/lib of the keycloak server's
-WAR file.
+WAR file.  You will then have to restart the authentication server.
 
 The ClasspathPropertiesFederationProvider is an example of a readonly provider.  If you go to the Users/Federation
   page of the admin console you will see this provider listed under "classpath-properties.  To configure this provider you 
 specify a classpath to a properties file in the "path" field of the admin page for this plugin.  This example includes
 a "test-users.properties" within the JAR that you can use as the variable.
   
-The FilePropertiesFederationProvider is an exxample of a writable provider.  It synchronizes changes made to
+The FilePropertiesFederationProvider is an example of a writable provider.  It synchronizes changes made to
 username and password with the properties file.  If you go to the Users/Federation page of the admin console you will 
 see this provider listed under "file-properties".  To configure this provider you specify a fully qualified file path to 
 a properties file in the "path" field of the admin page for this plugin.  

examples/providers/federation-provider/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>examples-providers-pom</artifactId>
         <groupId>org.keycloak</groupId>
-        <version>1.0-beta-4</version>
+        <version>1.0-rc-1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <name>Properties Authentication Provider Example</name>

examples/providers/federation-provider/src/main/java/org/keycloak/examples/federation/properties/BasePropertiesFederationFactory.java

@@ -2,12 +2,19 @@ package org.keycloak.examples.federation.properties;
 
 import org.keycloak.Config;
 import org.keycloak.models.KeycloakSession;
+import org.keycloak.models.KeycloakSessionFactory;
+import org.keycloak.models.KeycloakSessionTask;
+import org.keycloak.models.RealmModel;
 import org.keycloak.models.UserFederationProvider;
 import org.keycloak.models.UserFederationProviderFactory;
 import org.keycloak.models.UserFederationProviderModel;
+import org.keycloak.models.UserModel;
+import org.keycloak.models.UserProvider;
+import org.keycloak.models.utils.KeycloakModelUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
@@ -84,4 +91,32 @@ public abstract class BasePropertiesFederationFactory implements UserFederationP
     public void close() {
 
     }
+
+    @Override
+    public void syncAllUsers(KeycloakSessionFactory sessionFactory, final String realmId, final UserFederationProviderModel model) {
+        KeycloakModelUtils.runJobInTransaction(sessionFactory, new KeycloakSessionTask() {
+
+            @Override
+            public void run(KeycloakSession session) {
+                RealmModel realm = session.realms().getRealm(realmId);
+                BasePropertiesFederationProvider federationProvider = (BasePropertiesFederationProvider)getInstance(session, model);
+                Set<String> allUsernames = federationProvider.getProperties().stringPropertyNames();
+                UserProvider localProvider = session.userStorage();
+                for (String username : allUsernames) {
+                    UserModel localUser = localProvider.getUserByUsername(username, realm);
+
+                    if (localUser == null) {
+                        // New user, let's import him
+                        federationProvider.getUserByUsername(realm, username);
+                    }
+                }
+            }
+
+        });
+    }
+
+    @Override
+    public void syncChangedUsers(KeycloakSessionFactory sessionFactory, final String realmId, final UserFederationProviderModel model, Date lastSync) {
+        syncAllUsers(sessionFactory, realmId, model);
+    }
 }

examples/providers/federation-provider/src/main/java/org/keycloak/examples/federation/properties/ClasspathPropertiesFederationFactory.java

@@ -1,19 +1,10 @@
 package org.keycloak.examples.federation.properties;
 
-import org.jboss.logging.Logger;
-import org.keycloak.Config;
 import org.keycloak.models.KeycloakSession;
-import org.keycloak.models.UserFederationProvider;
-import org.keycloak.models.UserFederationProviderFactory;
 import org.keycloak.models.UserFederationProviderModel;
 
-import java.io.IOException;
 import java.io.InputStream;
-import java.util.HashSet;
-import java.util.List;
 import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@@ -21,6 +12,8 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class ClasspathPropertiesFederationFactory extends BasePropertiesFederationFactory {
 
+    public static final String PROVIDER_NAME = "classpath-properties";
+
     @Override
     protected BasePropertiesFederationProvider createProvider(KeycloakSession session, UserFederationProviderModel model, Properties props) {
         return new ClasspathPropertiesFederationProvider(session, model, props);
@@ -39,6 +32,6 @@ public class ClasspathPropertiesFederationFactory extends BasePropertiesFederati
 
     @Override
     public String getId() {
-        return "classpath-properties";
+        return PROVIDER_NAME;
     }
 }

examples/providers/federation-provider/src/main/java/org/keycloak/examples/federation/properties/ClasspathPropertiesFederationProvider.java

@@ -2,19 +2,10 @@ package org.keycloak.examples.federation.properties;
 
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
-import org.keycloak.models.RoleModel;
-import org.keycloak.models.UserCredentialModel;
-import org.keycloak.models.UserFederationProvider;
 import org.keycloak.models.UserFederationProviderModel;
 import org.keycloak.models.UserModel;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>

examples/providers/federation-provider/src/main/java/org/keycloak/examples/federation/properties/FilePropertiesFederationFactory.java

@@ -14,6 +14,8 @@ import java.util.Properties;
  */
 public class FilePropertiesFederationFactory extends BasePropertiesFederationFactory {
 
+    public static final String PROVIDER_NAME = "file-properties";
+
     @Override
     protected BasePropertiesFederationProvider createProvider(KeycloakSession session, UserFederationProviderModel model, Properties props) {
         return new FilePropertiesFederationProvider(session, props, model);
@@ -35,6 +37,6 @@ public class FilePropertiesFederationFactory extends BasePropertiesFederationFac
      */
     @Override
     public String getId() {
-        return "file-properties";
+        return PROVIDER_NAME;
     }
 }

examples/providers/federation-provider/src/main/java/org/keycloak/examples/federation/properties/FilePropertiesFederationProvider.java

@@ -2,21 +2,12 @@ package org.keycloak.examples.federation.properties;
 
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.RealmModel;
-import org.keycloak.models.RoleModel;
-import org.keycloak.models.UserCredentialModel;
-import org.keycloak.models.UserFederationProvider;
 import org.keycloak.models.UserFederationProviderModel;
 import org.keycloak.models.UserModel;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>