keycloak-memoizeit

diff --git a/docbook/reference/en/en-US/modules/server-installation.xml b/docbook/reference/en/en-US/modules/server-installation.xml
index 6050bae..873fd6e 100755
--- a/docbook/reference/en/en-US/modules/server-installation.xml
+++ b/docbook/reference/en/en-US/modules/server-installation.xml
@@ -271,6 +271,28 @@ keycloak-war-dist-all-1.0-beta-1-SNAPSHOT/
             </para>
         </section>
         <section>
+            <title>AS7/EAP6.x Logging</title>
+            <para>
+                Accessing the admin console will get these annoying log messages:
+            </para>
+<programlisting>
+    WARN  [org.jboss.resteasy.core.ResourceLocator] (http-/127.0.0.1:8080-3)
+                Field providers of subresource xxx will not be injected according to spec
+
+</programlisting>
+
+            <para>
+                These can be ignored by editing standalone.xml of your jboss installation:
+            </para>
+<programlisting>
+<![CDATA[
+    <logger category="org.jboss.resteasy.core.ResourceLocator">
+        <level name="ERROR"/>
+    </logger>
+]]>
+</programlisting>
+        </section>
+        <section>
             <title>SSL/HTTPS Setup</title>
             <warning>
                 <para>

diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterDeploymentContext.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterDeploymentContext.java
index 1a83571..c44ad67 100755
--- a/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterDeploymentContext.java
+++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterDeploymentContext.java
@@ -290,7 +290,9 @@ public class AdapterDeploymentContext {
         }
         builder.scheme(scheme);
         builder.host(request.getHost());
-        builder.port(request.getPort());
+        if (request.getPort() != -1) {
+           builder.port(request.getPort());
+        }
         return builder;
     }
 

diff --git a/project-integrations/aerogear-ups/auth-server/pom.xml b/project-integrations/aerogear-ups/auth-server/pom.xml
index 7c738b8..6ac1405 100755
--- a/project-integrations/aerogear-ups/auth-server/pom.xml
+++ b/project-integrations/aerogear-ups/auth-server/pom.xml
@@ -73,30 +73,6 @@
             <artifactId>keycloak-social-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-social-github</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-social-google</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-social-twitter</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.twitter4j</groupId>
-            <artifactId>twitter4j-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-social-facebook</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <!-- forms -->
         <dependency>
             <groupId>org.keycloak</groupId>

diff --git a/project-integrations/aerogear-ups/README.md b/project-integrations/aerogear-ups/README.md
index 83732aa..7a16c26 100755
--- a/project-integrations/aerogear-ups/README.md
+++ b/project-integrations/aerogear-ups/README.md
@@ -1,7 +1,7 @@
 Self Bootstrapping Keycloak Server and Application
 ==========================================================
 
-This is an example of bundling a keycloak server war and application together so that keycloak is bootstrapped out of the
+This is an example of bundling two wars: a keycloak server war and application WAR together so that keycloak is bootstrapped out of the
 box.
 
 * There is a testrealm.json file that is used to bootstrap the realm in the auth-server/ project
@@ -16,3 +16,9 @@ will now query the auth server url for the public key of the realm.
 Problems:
 * Biggest problem is SSL.  You have to crack open web.xml to set up a confidential security constraint.  You also have
 to change the adapter config and the realm config to make SSL required.
+* You need to set this logging config in standalone.xml otherwise you will get a lot of warning messages when accessing the admin console
+
+            <logger category="org.jboss.resteasy.core.ResourceLocator">
+                <level name="ERROR"/>
+            </logger>
+