keycloak-aplcache
Changes
distribution/adapters/pom.xml 14(+7 -7)
distribution/pom.xml 8(+4 -4)
distribution/server-overlay/pom.xml 2(+1 -1)
examples/broker/pom.xml 2(+1 -1)
examples/fuse/cxf-jaxrs/pom.xml 2(+1 -1)
examples/fuse/cxf-jaxws/pom.xml 2(+1 -1)
examples/pom.xml 2(+1 -1)
forms/account-api/pom.xml 4(+2 -2)
forms/common-themes/pom.xml 4(+2 -2)
forms/login-api/pom.xml 4(+2 -2)
integration/jetty/pom.xml 4(+2 -2)
integration/pom.xml 10(+5 -5)
integration/spring-security/pom.xml 2(+0 -2)
integration/tomcat/pom.xml 6(+3 -3)
integration/tomcat/tomcat-core/pom.xml 21(+6 -15)
integration/wildfly/pom.xml 8(+4 -4)
model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java 16(+10 -6)
pom.xml 143(+87 -56)
saml/saml-protocol/pom.xml 4(+2 -2)
services/pom.xml 4(+2 -2)
testsuite/integration/pom.xml 63(+55 -8)
testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java 124(+62 -62)
testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java 82(+41 -41)
testsuite/integration/src/test/java/org/keycloak/testsuite/admin/AbstractClientTest.java 103(+0 -103)
testsuite/integration/src/test/java/org/keycloak/testsuite/admin/IdentityProviderTest.java 122(+0 -122)
testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsBasicAuthTest.java 143(+0 -143)
testsuite/integration/src/test/java/org/keycloak/testsuite/jaxrs/JaxrsTestApplication.java 38(+0 -38)
testsuite/performance/pom.xml 5(+1 -4)
testsuite/pom.xml 16(+8 -8)
Details
distribution/adapters/pom.xml 14(+7 -7)
diff --git a/distribution/adapters/pom.xml b/distribution/adapters/pom.xml
index d65c0c7..a819bf8 100755
--- a/distribution/adapters/pom.xml
+++ b/distribution/adapters/pom.xml
@@ -17,14 +17,14 @@
<modules>
<module>as7-eap6-adapter</module>
<module>jetty81-adapter-zip</module>
- <module>jetty91-adapter-zip</module>
- <module>jetty92-adapter-zip</module>
+ <!--<module>jetty91-adapter-zip</module>-->
+ <!--<module>jetty92-adapter-zip</module>-->
<module>js-adapter-zip</module>
<module>osgi</module>
- <module>tomcat6-adapter-zip</module>
- <module>tomcat7-adapter-zip</module>
- <module>tomcat8-adapter-zip</module>
- <module>wf8-adapter</module>
- <module>wf9-adapter</module>
+ <!--<module>tomcat6-adapter-zip</module>-->
+ <!--<module>tomcat7-adapter-zip</module>-->
+ <!--<module>tomcat8-adapter-zip</module>-->
+ <!--<module>wf8-adapter</module>-->
+ <!--<module>wf9-adapter</module>-->
</modules>
</project>
distribution/pom.xml 8(+4 -4)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 709c264..c9beb0d 100755
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -16,14 +16,14 @@
<modules>
<module>adapters</module>
- <module>demo-dist</module>
+ <!--<module>demo-dist</module>-->
<module>docs-dist</module>
<module>examples-dist</module>
- <module>proxy-dist</module>
- <module>server-dist</module>
+ <!--<module>proxy-dist</module>-->
+ <!--<module>server-dist</module>-->
<module>server-overlay</module>
<module>src-dist</module>
- <module>feature-packs</module>
+ <!--<module>feature-packs</module>-->
</modules>
<profiles>
distribution/server-overlay/pom.xml 2(+1 -1)
diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml
index 3f8216d..617d8aa 100755
--- a/distribution/server-overlay/pom.xml
+++ b/distribution/server-overlay/pom.xml
@@ -15,7 +15,7 @@
<modules>
- <module>wf9-server-overlay</module>
+ <!--<module>wf9-server-overlay</module>-->
<module>eap6</module>
</modules>
</project>
examples/broker/pom.xml 2(+1 -1)
diff --git a/examples/broker/pom.xml b/examples/broker/pom.xml
index 1466eda..449b982 100755
--- a/examples/broker/pom.xml
+++ b/examples/broker/pom.xml
@@ -17,6 +17,6 @@
<module>facebook-authentication</module>
<module>google-authentication</module>
<module>saml-broker-authentication</module>
- <module>twitter-authentication</module>
+ <!--<module>twitter-authentication</module>-->
</modules>
</project>
\ No newline at end of file
diff --git a/examples/broker/twitter-authentication/pom.xml b/examples/broker/twitter-authentication/pom.xml
index b0b84e5..f0556f3 100755
--- a/examples/broker/twitter-authentication/pom.xml
+++ b/examples/broker/twitter-authentication/pom.xml
@@ -45,9 +45,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>jaxrs-api</artifactId>
- <version>3.0.10.Final</version>
+ <groupId>org.jboss.spec.javax.ws.rs</groupId>
+ <artifactId>jboss-jaxrs-api_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
examples/fuse/cxf-jaxrs/pom.xml 2(+1 -1)
diff --git a/examples/fuse/cxf-jaxrs/pom.xml b/examples/fuse/cxf-jaxrs/pom.xml
index 532136f..75ff17c 100755
--- a/examples/fuse/cxf-jaxrs/pom.xml
+++ b/examples/fuse/cxf-jaxrs/pom.xml
@@ -14,7 +14,7 @@
<name>CXF JAXRS Example - Secured in Karaf/Fuse</name>
<properties>
- <cxf.version>2.7.14</cxf.version>
+ <cxf.version>2.7.14.redhat-1</cxf.version>
<keycloak.osgi.export>
</keycloak.osgi.export>
<keycloak.osgi.import>
examples/fuse/cxf-jaxws/pom.xml 2(+1 -1)
diff --git a/examples/fuse/cxf-jaxws/pom.xml b/examples/fuse/cxf-jaxws/pom.xml
index 42bf4c6..670b9c6 100755
--- a/examples/fuse/cxf-jaxws/pom.xml
+++ b/examples/fuse/cxf-jaxws/pom.xml
@@ -15,7 +15,7 @@
<description/>
<properties>
- <cxf.version>2.7.14</cxf.version>
+ <cxf.version>2.7.14.redhat-1</cxf.version>
<keycloak.osgi.export>
</keycloak.osgi.export>
<keycloak.osgi.import>
examples/pom.xml 2(+1 -1)
diff --git a/examples/pom.xml b/examples/pom.xml
index ce26498..f6ddf1d 100755
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -32,7 +32,7 @@
</plugins>
</build>
<modules>
- <module>admin-client</module>
+ <!--<module>admin-client</module>-->
<module>broker</module>
<module>cors</module>
<module>demo-template</module>
forms/account-api/pom.xml 4(+2 -2)
diff --git a/forms/account-api/pom.xml b/forms/account-api/pom.xml
index 5d813d2..dec0177 100755
--- a/forms/account-api/pom.xml
+++ b/forms/account-api/pom.xml
@@ -30,8 +30,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>jaxrs-api</artifactId>
+ <groupId>org.jboss.spec.javax.ws.rs</groupId>
+ <artifactId>jboss-jaxrs-api_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
forms/common-themes/pom.xml 4(+2 -2)
diff --git a/forms/common-themes/pom.xml b/forms/common-themes/pom.xml
index 6625115..febb837 100755
--- a/forms/common-themes/pom.xml
+++ b/forms/common-themes/pom.xml
@@ -30,8 +30,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>jaxrs-api</artifactId>
+ <groupId>org.jboss.spec.javax.ws.rs</groupId>
+ <artifactId>jboss-jaxrs-api_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
forms/login-api/pom.xml 4(+2 -2)
diff --git a/forms/login-api/pom.xml b/forms/login-api/pom.xml
index df1eb8b..b95a679 100755
--- a/forms/login-api/pom.xml
+++ b/forms/login-api/pom.xml
@@ -25,8 +25,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>jaxrs-api</artifactId>
+ <groupId>org.jboss.spec.javax.ws.rs</groupId>
+ <artifactId>jboss-jaxrs-api_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
integration/jetty/pom.xml 4(+2 -2)
diff --git a/integration/jetty/pom.xml b/integration/jetty/pom.xml
index 06ac4c9..df762b3 100755
--- a/integration/jetty/pom.xml
+++ b/integration/jetty/pom.xml
@@ -16,7 +16,7 @@
<modules>
<module>jetty-core</module>
<module>jetty8.1</module>
- <module>jetty9.2</module>
- <module>jetty9.1</module>
+ <!--<module>jetty9.2</module>-->
+ <!--<module>jetty9.1</module>-->
</modules>
</project>
integration/pom.xml 10(+5 -5)
diff --git a/integration/pom.xml b/integration/pom.xml
index d353709..7f5281d 100755
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -15,19 +15,19 @@
<modules>
<module>adapter-core</module>
- <module>jaxrs-oauth-client</module>
+ <!--<module>jaxrs-oauth-client</module>-->
<module>servlet-oauth-client</module>
<module>jboss-adapter-core</module>
<module>tomcat</module>
<module>as7-eap6</module>
<module>jetty</module>
- <module>undertow</module>
+ <!--<module>undertow</module>-->
<module>wildfly</module>
<module>js</module>
<module>installed</module>
- <module>admin-client</module>
+ <!--<module>admin-client</module>-->
<module>osgi-adapter</module>
- <module>spring-boot</module>
- <module>spring-security</module>
+ <!--<module>spring-boot</module>-->
+ <!--<module>spring-security</module>-->
</modules>
</project>
integration/spring-security/pom.xml 2(+0 -2)
diff --git a/integration/spring-security/pom.xml b/integration/spring-security/pom.xml
index ec0ccaf..b58540a 100755
--- a/integration/spring-security/pom.xml
+++ b/integration/spring-security/pom.xml
@@ -17,7 +17,6 @@
<spring.version>3.2.7.RELEASE</spring.version>
<spring-security.version>3.2.7.RELEASE</spring-security.version>
<mockito.version>1.9.5</mockito.version>
- <apache-httpcomponents.version>4.3.6</apache-httpcomponents.version>
</properties>
<dependencies>
@@ -56,7 +55,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${apache-httpcomponents.version}</version>
</dependency>
<dependency>
<groupId>net.iharder</groupId>
integration/tomcat/pom.xml 6(+3 -3)
diff --git a/integration/tomcat/pom.xml b/integration/tomcat/pom.xml
index 5e61a9f..ab330d7 100755
--- a/integration/tomcat/pom.xml
+++ b/integration/tomcat/pom.xml
@@ -15,8 +15,8 @@
<modules>
<module>tomcat-core</module>
- <module>tomcat6</module>
- <module>tomcat7</module>
- <module>tomcat8</module>
+ <!--<module>tomcat6</module>-->
+ <!--<module>tomcat7</module>-->
+ <!--<module>tomcat8</module>-->
</modules>
</project>
integration/tomcat/tomcat-core/pom.xml 21(+6 -15)
diff --git a/integration/tomcat/tomcat-core/pom.xml b/integration/tomcat/tomcat-core/pom.xml
index d8fbdd1..d8f8f88 100755
--- a/integration/tomcat/tomcat-core/pom.xml
+++ b/integration/tomcat/tomcat-core/pom.xml
@@ -12,8 +12,6 @@
<artifactId>keycloak-tomcat-core-adapter</artifactId>
<name>Keycloak Tomcat Core Integration</name>
<properties>
- <!-- <tomcat.version>8.0.14</tomcat.version> -->
- <!-- <tomcat.version>7.0.52</tomcat.version> -->
<tomcat.version>6.0.41</tomcat.version>
</properties>
<description />
@@ -22,7 +20,6 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>${jboss.logging.version}</version>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
@@ -56,21 +53,15 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
</dependency>
- <!--
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
- <version>${tomcat.version}</version>
+ <groupId>org.jboss.web</groupId>
+ <artifactId>jbossweb</artifactId>
<scope>compile</scope>
</dependency>
- -->
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>catalina</artifactId>
- <version>${tomcat.version}</version>
- <scope>compile</scope>
- </dependency>
-
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
integration/wildfly/pom.xml 8(+4 -4)
diff --git a/integration/wildfly/pom.xml b/integration/wildfly/pom.xml
index 29f5a96..ff238ea 100644
--- a/integration/wildfly/pom.xml
+++ b/integration/wildfly/pom.xml
@@ -14,10 +14,10 @@
<packaging>pom</packaging>
<modules>
- <module>wildfly-adapter</module>
+ <!--<module>wildfly-adapter</module>-->
<module>wildfly-extensions</module>
- <module>wf8-subsystem</module>
+ <!--<module>wf8-subsystem</module>
<module>wf9-subsystem</module>
- <module>wf9-server-subsystem</module>
+ <module>wf9-server-subsystem</module>-->
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java
index b046efc..37bcb2b 100755
--- a/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java
+++ b/model/invalidation-cache/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheUserProviderFactory.java
@@ -14,6 +14,8 @@ import org.keycloak.models.cache.CacheUserProvider;
import org.keycloak.models.cache.CacheUserProviderFactory;
import org.keycloak.models.cache.entities.CachedUser;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -28,7 +30,7 @@ public class InfinispanCacheUserProviderFactory implements CacheUserProviderFact
protected final RealmLookup emailLookup = new RealmLookup();
// Method CacheEntryCreatedEvent.getValue is available from ispn 6 (EAP6 and AS7 are on ispn 5)
- private boolean isNewInfinispan;
+ private Method eventGetValueMethod;
@Override
public CacheUserProvider create(KeycloakSession session) {
@@ -51,10 +53,8 @@ public class InfinispanCacheUserProviderFactory implements CacheUserProviderFact
protected void checkIspnVersion() {
try {
- CacheEntryCreatedEvent.class.getMethod("getValue");
- isNewInfinispan = true;
+ eventGetValueMethod = CacheEntryCreatedEvent.class.getMethod("getValue");
} catch (NoSuchMethodException nsme) {
- isNewInfinispan = false;
}
}
@@ -86,8 +86,12 @@ public class InfinispanCacheUserProviderFactory implements CacheUserProviderFact
CachedUser cachedUser;
// Try optimized version if available
- if (isNewInfinispan) {
- cachedUser = event.getValue();
+ if (eventGetValueMethod != null) {
+ try {
+ cachedUser = (CachedUser) eventGetValueMethod.invoke(event);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
} else {
String userId = event.getKey();
cachedUser = event.getCache().get(userId);
pom.xml 143(+87 -56)
diff --git a/pom.xml b/pom.xml
index 6e59c3e..f9fb16d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,30 +20,34 @@
<properties>
<apacheds.version>2.0.0-M17</apacheds.version>
<apacheds.codec.version>1.0.0-M23</apacheds.codec.version>
- <org.apache.james.apache-mime4j.version>0.6</org.apache.james.apache-mime4j.version>
- <base64.version>2.3.8</base64.version>
- <bouncycastle.crypto.version>1.50</bouncycastle.crypto.version>
- <jackson.version>1.9.9</jackson.version>
- <apache.httpcomponents.version>4.3.6</apache.httpcomponents.version>
- <apache.httpcomponents.httpcore.version>4.3.3</apache.httpcomponents.httpcore.version>
- <resteasy.version>2.3.7.Final</resteasy.version>
+ <!-- Mime4j version has to be in sync with eap6-supported-artifacts bom -->
+ <org.apache.james.apache-mime4j.version>0.6.0.redhat-4</org.apache.james.apache-mime4j.version>
+ <base64.version>2.3.8.redhat-6</base64.version>
+ <bouncycastle.crypto.version>1.50.0.redhat-1</bouncycastle.crypto.version>
+ <!-- Jakson and httpcomponents versions have to be in sync with eap6-supported-artifacts bom -->
+ <jackson.version>1.9.9.redhat-4</jackson.version>
+ <apache.httpcomponents.version>4.3.6.redhat-1</apache.httpcomponents.version>
+ <!--<apache.httpcomponents.httpcore.version>4.3.3</apache.httpcomponents.httpcore.version>-->
+ <!--<resteasy.version>2.3.7.Final</resteasy.version>-->
<resteasy.latest.version>3.0.9.Final</resteasy.latest.version>
<keycloak.apache.httpcomponents.version>4.2.1</keycloak.apache.httpcomponents.version>
<undertow.version>1.1.1.Final</undertow.version>
<picketlink.version>2.7.0.Final</picketlink.version>
<mongo.driver.version>2.11.3</mongo.driver.version>
- <jboss.logging.version>3.1.4.GA</jboss.logging.version>
+ <!-- jboss.logging version has to be in sync with eap6-supported-artifacts bom -->
+ <jboss.logging.version>3.1.4.GA-redhat-2</jboss.logging.version>
<syslog4j.version>0.9.30</syslog4j.version>
- <jboss-logging-tools.version>1.2.0.Beta1</jboss-logging-tools.version>
- <jboss.spec.javax.xml.bind.jboss-jaxb-api_2.2_spec.version>1.0.4.Final</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.2_spec.version>
- <io.netty.version>4.0.26.Final</io.netty.version>
+ <jboss-logging-tools.version>1.2.0.Final</jboss-logging-tools.version>
+ <!--<jboss.spec.javax.xml.bind.jboss-jaxb-api_2.2_spec.version>1.0.4.Final</jboss.spec.javax.xml.bind.jboss-jaxb-api_2.2_spec.version>-->
+ <!--<io.netty.version>4.0.26.Final</io.netty.version>-->
<xnio.netty.netty-xnio-transport.version>0.1.1.Final</xnio.netty.netty-xnio-transport.version>
<hibernate.javax.persistence.version>1.0.0.Final</hibernate.javax.persistence.version>
<hibernate.entitymanager.version>4.3.10.Final</hibernate.entitymanager.version>
- <h2.version>1.4.187</h2.version>
+ <hibernate.commons-annotations.version>4.0.5.Final</hibernate.commons-annotations.version>
+ <!--<h2.version>1.4.187</h2.version>-->
<mysql.version>5.1.29</mysql.version>
<postgresql.version>9.3-1100-jdbc41</postgresql.version>
- <dom4j.version>1.6.1</dom4j.version>
+ <!--<dom4j.version>1.6.1</dom4j.version>-->
<xml-apis.version>1.4.01</xml-apis.version>
<slf4j.version>1.7.7</slf4j.version>
<wildfly.version>9.0.1.Final</wildfly.version>
@@ -53,29 +57,30 @@
<!-- this is EAP 6.4 alpha, publicly available -->
<jboss.version>7.5.0.Final-redhat-15</jboss.version>
- <servlet.api.30.version>1.0.2.Final</servlet.api.30.version>
- <google.zxing.version>2.2</google.zxing.version>
+ <!--<servlet.api.30.version>1.0.2.Final</servlet.api.30.version>-->
+ <google.zxing.version>2.2.0.redhat-4</google.zxing.version>
<google.client.version>1.14.1-beta</google.client.version>
- <github.relaxng.version>2011.1</github.relaxng.version>
+ <!--<github.relaxng.version>2011.1</github.relaxng.version>-->
<winzipaes.version>1.0.1</winzipaes.version>
- <freemarker.version>2.3.20</freemarker.version>
+ <freemarker.version>2.3.20.redhat-2</freemarker.version>
<twitter4j.version>3.0.5</twitter4j.version>
<selenium.version>2.35.0</selenium.version>
- <sun.istack.version>2.21</sun.istack.version>
+ <!--<sun.istack.version>2.21</sun.istack.version>-->
<sun.jaxb.version>2.2.11</sun.jaxb.version>
- <sun.xsom.version>20140925</sun.xsom.version>
- <javax.mail.version>1.4.5</javax.mail.version>
+ <!--<sun.xsom.version>20140925</sun.xsom.version>
+ <javax.mail.version>1.4.5</javax.mail.version>-->
<infinispan.version>6.0.2.Final</infinispan.version>
- <liquibase.version>3.3.5</liquibase.version>
+ <liquibase.version>3.3.5.redhat-1</liquibase.version>
<jetty9.version>9.1.0.v20131115</jetty9.version>
- <osgi.version>4.2.0</osgi.version>
+ <!--<osgi.version>4.2.0</osgi.version>-->
<pax.web.version>3.1.2</pax.web.version>
<jmeter.version>2.10</jmeter.version>
<junit.version>4.12</junit.version>
<hamcrest.version>1.3</hamcrest.version>
<log4j.version>1.2.17</log4j.version>
<greenmail.version>1.3.1b</greenmail.version>
- <xmlsec.version>1.5.1</xmlsec.version>
+ <!--<xmlsec.version>1.5.1</xmlsec.version>-->
+ <keycloak.community.version>1.4.0.Final</keycloak.community.version>
<enforcer.plugin.version>1.4</enforcer.plugin.version>
<jboss.as.plugin.version>7.5.Final</jboss.as.plugin.version>
@@ -140,7 +145,7 @@
<module>events</module>
<module>model</module>
<module>integration</module>
- <module>proxy</module>
+ <!--<module>proxy</module>-->
<module>federation</module>
<module>services</module>
<module>saml</module>
@@ -157,6 +162,13 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.jboss.bom</groupId>
+ <artifactId>eap6-supported-artifacts</artifactId>
+ <version>6.4.0.GA</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <!--<dependency>
<groupId>com.github.relaxng</groupId>
<artifactId>relaxngDatatype</artifactId>
<version>${github.relaxng.version}</version>
@@ -170,17 +182,17 @@
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-tools</artifactId>
<version>${sun.istack.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>com.sun.xml.bind.external</groupId>
<artifactId>rngom</artifactId>
<version>${sun.jaxb.version}</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>com.sun.xsom</groupId>
<artifactId>xsom</artifactId>
<version>${sun.xsom.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
@@ -196,7 +208,7 @@
<artifactId>base64</artifactId>
<version>${base64.version}</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${javax.mail.version}</version>
@@ -241,7 +253,7 @@
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${io.netty.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.jboss.xnio.netty</groupId>
<artifactId>netty-xnio-transport</artifactId>
@@ -256,13 +268,15 @@
<groupId>io.undertow</groupId>
<artifactId>undertow-servlet</artifactId>
<version>${undertow.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.undertow</groupId>
<artifactId>undertow-core</artifactId>
<version>${undertow.version}</version>
+ <scope>test</scope>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>${jackson.version}</version>
@@ -286,6 +300,12 @@
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
<version>${servlet.api.30.version}</version>
+ </dependency>-->
+ <dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-federation</artifactId>
+ <version>${picketlink.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.picketlink</groupId>
@@ -293,11 +313,11 @@
<version>${picketlink.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>${jboss.logging.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.syslog4j</groupId>
<artifactId>syslog4j</artifactId>
@@ -307,6 +327,7 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -325,23 +346,33 @@
<artifactId>hibernate-jpa-2.1-api</artifactId>
<version>${hibernate.javax.persistence.version}</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${hibernate.entitymanager.version}</version>
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate.entitymanager.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.common</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>${hibernate.commons-annotations.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>${freemarker.version}</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
<version>${xmlsec.version}</version>
@@ -357,7 +388,7 @@
<artifactId>wildfly-dist</artifactId>
<version>${wildfly.version}</version>
<type>zip</type>
- </dependency>
+ </dependency>-->
<!-- Twitter -->
<dependency>
@@ -439,12 +470,12 @@
<version>${jmeter.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>${dom4j.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
@@ -452,11 +483,11 @@
<scope>test</scope>
</dependency>
<!-- Older 1.5.10 binding required by embedded ApacheDS -->
- <dependency>
+ <!--<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
@@ -470,12 +501,12 @@
<version>${mysql.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${apache.httpcomponents.version}</version>
- </dependency>
- <dependency>
+ <!--<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${apache.httpcomponents.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${apache.httpcomponents.httpcore.version}</version>
@@ -490,7 +521,7 @@
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j</artifactId>
@@ -507,7 +538,7 @@
<artifactId>wildfly-controller</artifactId>
<version>${wildfly.core.version}</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-server</artifactId>
<version>${wildfly.core.version}</version>
@@ -516,7 +547,7 @@
<groupId>org.wildfly</groupId>
<artifactId>wildfly-ee</artifactId>
<version>${wildfly.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-feature-pack</artifactId>
@@ -529,13 +560,13 @@
<version>${wildfly.version}</version>
<type>zip</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-subsystem-test</artifactId>
<version>${wildfly.core.version}</version>
<type>pom</type>
<scope>test</scope>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-undertow</artifactId>
@@ -548,7 +579,7 @@
<version>${wildfly.core.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-core-feature-pack</artifactId>
<type>pom</type>
@@ -564,7 +595,7 @@
<groupId>org.wildfly.core</groupId>
<artifactId>wildfly-version</artifactId>
<version>${wildfly.core.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-web-common</artifactId>
@@ -586,7 +617,7 @@
<artifactId>liquibase-core</artifactId>
<version>${liquibase.version}</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
@@ -595,7 +626,7 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
<version>${osgi.version}</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-runtime</artifactId>
@@ -1356,7 +1387,7 @@
<id>distribution</id>
<modules>
<module>distribution</module>
- <module>testsuite/integration-arquillian</module>
+ <!--<module>testsuite/integration-arquillian</module>-->
</modules>
</profile>
<profile>
saml/saml-protocol/pom.xml 4(+2 -2)
diff --git a/saml/saml-protocol/pom.xml b/saml/saml-protocol/pom.xml
index b60a76b..deb7ab3 100755
--- a/saml/saml-protocol/pom.xml
+++ b/saml/saml-protocol/pom.xml
@@ -98,8 +98,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>jaxrs-api</artifactId>
+ <groupId>org.jboss.spec.javax.ws.rs</groupId>
+ <artifactId>jboss-jaxrs-api_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
services/pom.xml 4(+2 -2)
diff --git a/services/pom.xml b/services/pom.xml
index ad02cc5..95f9d24 100755
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -129,8 +129,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>jaxrs-api</artifactId>
+ <groupId>org.jboss.spec.javax.ws.rs</groupId>
+ <artifactId>jboss-jaxrs-api_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
testsuite/integration/pom.xml 63(+55 -8)
diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index 3ec6683..f2ba3e3 100755
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -13,8 +13,25 @@
<name>Keycloak Integration TestSuite</name>
<description />
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-parent</artifactId>
+ <version>1.1.1.Final</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.3.6.redhat-1</version>
+ </dependency>
+ <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</dependency>
@@ -27,10 +44,10 @@
<artifactId>keycloak-dependencies-server-all</artifactId>
<type>pom</type>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -42,14 +59,20 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
+ <version>3.0.10.Final</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>async-http-servlet-3.0</artifactId>
+ <version>3.0.10.Final</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
+ <version>3.0.10.Final</version>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
@@ -68,28 +91,32 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
+ <version>3.0.10.Final</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-undertow</artifactId>
+ <version>3.0.10.Final</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
+ <version>3.0.10.Final</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
+ <version>3.0.10.Final</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-ldap-federation</artifactId>
</dependency>
@@ -99,12 +126,18 @@
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
- <artifactId>keycloak-undertow-adapter</artifactId>
+ <artifactId>keycloak-adapter-core</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
- <artifactId>keycloak-jaxrs-oauth-client</artifactId>
+ <artifactId>keycloak-undertow-adapter</artifactId>
+ <version>${keycloak.community.version}</version>
+ <scope>test</scope>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.keycloak</groupId>-->
+ <!--<artifactId>keycloak-jaxrs-oauth-client</artifactId>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>federation-properties-example</artifactId>
@@ -154,6 +187,14 @@
<artifactId>hibernate-entitymanager</artifactId>
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.common</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
<exclusions>
@@ -192,6 +233,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.picketlink</groupId>
+ <artifactId>picketlink-federation</artifactId>
+ <version>${picketlink.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-undertow</artifactId>
<scope>test</scope>
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java
index 5d02107..77554f6 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTest.java
@@ -98,10 +98,10 @@ public class AdapterTest {
@Rule
public AdapterTestStrategy testStrategy = new AdapterTestStrategy("http://localhost:8081/auth", "http://localhost:8081", keycloakRule);
- @Test
- public void testLoginSSOAndLogout() throws Exception {
- testStrategy.testLoginSSOAndLogout();
- }
+// @Test
+// public void testLoginSSOAndLogout() throws Exception {
+// testStrategy.testLoginSSOAndLogout();
+// }
@Test
public void testSavedPostRequest() throws Exception {
@@ -188,10 +188,10 @@ public class AdapterTest {
/**
* KEYCLOAK-942
*/
- @Test
- public void testAdminApplicationLogout() throws Throwable {
- testStrategy.testAdminApplicationLogout();
- }
+// @Test
+// public void testAdminApplicationLogout() throws Throwable {
+// testStrategy.testAdminApplicationLogout();
+// }
/**
* KEYCLOAK-1216
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java
index 35774cd..e467fc9 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/AdapterTestStrategy.java
@@ -31,7 +31,7 @@ import org.junit.rules.ExternalResource;
import org.keycloak.Config;
import org.keycloak.OAuth2Constants;
import org.keycloak.Version;
-import org.keycloak.admin.client.Keycloak;
+//import org.keycloak.admin.client.Keycloak;
import org.keycloak.constants.AdapterConstants;
import org.keycloak.models.ClientModel;
import org.keycloak.models.ClientSessionModel;
@@ -49,7 +49,7 @@ import org.keycloak.services.managers.RealmManager;
import org.keycloak.services.managers.ResourceAdminManager;
import org.keycloak.services.resources.admin.AdminRoot;
import org.keycloak.testsuite.OAuthClient;
-import org.keycloak.testsuite.admin.ApiUtil;
+//import org.keycloak.testsuite.admin.ApiUtil;
import org.keycloak.testsuite.pages.AccountSessionsPage;
import org.keycloak.testsuite.pages.LoginPage;
import org.keycloak.testsuite.rule.AbstractKeycloakRule;
@@ -177,49 +177,49 @@ public class AdapterTestStrategy extends ExternalResource {
}
- public void testLoginSSOAndLogout() throws Exception {
- // test login to customer-portal which does a bearer request to customer-db
- driver.navigate().to(APP_SERVER_BASE_URL + "/customer-portal");
- System.out.println("Current url: " + driver.getCurrentUrl());
- Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
- loginPage.login("bburke@redhat.com", "password");
- System.out.println("Current url: " + driver.getCurrentUrl());
- Assert.assertEquals(driver.getCurrentUrl(), APP_SERVER_BASE_URL + "/customer-portal" + slash);
- String pageSource = driver.getPageSource();
- System.out.println(pageSource);
- Assert.assertTrue(pageSource.contains("Bill Burke") && pageSource.contains("Stian Thorgersen"));
-
- // test SSO
- driver.navigate().to(APP_SERVER_BASE_URL + "/product-portal");
- Assert.assertEquals(driver.getCurrentUrl(), APP_SERVER_BASE_URL + "/product-portal" + slash);
- pageSource = driver.getPageSource();
- System.out.println(pageSource);
- Assert.assertTrue(pageSource.contains("iPhone") && pageSource.contains("iPad"));
-
- // View stats
- List<Map<String, String>> stats = Keycloak.getInstance("http://localhost:8081/auth", "master", "admin", "admin", "security-admin-console").realm("demo").getClientSessionStats();
- Map<String, String> customerPortalStats = null;
- Map<String, String> productPortalStats = null;
- for (Map<String, String> s : stats) {
- if (s.get("clientId").equals("customer-portal")) {
- customerPortalStats = s;
- } else if (s.get("clientId").equals("product-portal")) {
- productPortalStats = s;
- }
- }
- Assert.assertEquals(1, Integer.parseInt(customerPortalStats.get("active")));
- Assert.assertEquals(1, Integer.parseInt(productPortalStats.get("active")));
-
- // test logout
- String logoutUri = OIDCLoginProtocolService.logoutUrl(UriBuilder.fromUri(AUTH_SERVER_URL))
- .queryParam(OAuth2Constants.REDIRECT_URI, APP_SERVER_BASE_URL + "/customer-portal").build("demo").toString();
- driver.navigate().to(logoutUri);
- Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
- driver.navigate().to(APP_SERVER_BASE_URL + "/product-portal");
- Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
- driver.navigate().to(APP_SERVER_BASE_URL + "/customer-portal");
- Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
- }
+// public void testLoginSSOAndLogout() throws Exception {
+// // test login to customer-portal which does a bearer request to customer-db
+// driver.navigate().to(APP_SERVER_BASE_URL + "/customer-portal");
+// System.out.println("Current url: " + driver.getCurrentUrl());
+// Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
+// loginPage.login("bburke@redhat.com", "password");
+// System.out.println("Current url: " + driver.getCurrentUrl());
+// Assert.assertEquals(driver.getCurrentUrl(), APP_SERVER_BASE_URL + "/customer-portal" + slash);
+// String pageSource = driver.getPageSource();
+// System.out.println(pageSource);
+// Assert.assertTrue(pageSource.contains("Bill Burke") && pageSource.contains("Stian Thorgersen"));
+
+// // test SSO
+// driver.navigate().to(APP_SERVER_BASE_URL + "/product-portal");
+// Assert.assertEquals(driver.getCurrentUrl(), APP_SERVER_BASE_URL + "/product-portal" + slash);
+// pageSource = driver.getPageSource();
+// System.out.println(pageSource);
+// Assert.assertTrue(pageSource.contains("iPhone") && pageSource.contains("iPad"));
+
+// // View stats
+// List<Map<String, String>> stats = Keycloak.getInstance("http://localhost:8081/auth", "master", "admin", "admin", "security-admin-console").realm("demo").getClientSessionStats();
+// Map<String, String> customerPortalStats = null;
+// Map<String, String> productPortalStats = null;
+// for (Map<String, String> s : stats) {
+// if (s.get("clientId").equals("customer-portal")) {
+// customerPortalStats = s;
+// } else if (s.get("clientId").equals("product-portal")) {
+// productPortalStats = s;
+// }
+// }
+// Assert.assertEquals(1, Integer.parseInt(customerPortalStats.get("active")));
+// Assert.assertEquals(1, Integer.parseInt(productPortalStats.get("active")));
+
+// // test logout
+// String logoutUri = OIDCLoginProtocolService.logoutUrl(UriBuilder.fromUri(AUTH_SERVER_URL))
+// .queryParam(OAuth2Constants.REDIRECT_URI, APP_SERVER_BASE_URL + "/customer-portal").build("demo").toString();
+// driver.navigate().to(logoutUri);
+// Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
+// driver.navigate().to(APP_SERVER_BASE_URL + "/product-portal");
+// Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
+// driver.navigate().to(APP_SERVER_BASE_URL + "/customer-portal");
+// Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
+// }
public void testServletRequestLogout() throws Exception {
// test login to customer-portal which does a bearer request to customer-db
@@ -588,23 +588,23 @@ public class AdapterTestStrategy extends ExternalResource {
Time.setOffset(0);
}
- /**
- * KEYCLOAK-942
- */
- public void testAdminApplicationLogout() throws Throwable {
- // login as bburke
- loginAndCheckSession(driver, loginPage);
-
- // logout mposolda with admin client
- Keycloak keycloakAdmin = Keycloak.getInstance(AUTH_SERVER_URL, "master", "admin", "admin", Constants.ADMIN_CONSOLE_CLIENT_ID);
- ApiUtil.findClientByClientId(keycloakAdmin.realm("demo"), "session-portal").logoutUser("mposolda");
-
- // bburke should be still logged with original httpSession in our browser window
- driver.navigate().to(APP_SERVER_BASE_URL + "/session-portal");
- Assert.assertEquals(driver.getCurrentUrl(), APP_SERVER_BASE_URL + "/session-portal" + slash);
- String pageSource = driver.getPageSource();
- Assert.assertTrue(pageSource.contains("Counter=3"));
- }
+// /**
+// * KEYCLOAK-942
+// */
+// public void testAdminApplicationLogout() throws Throwable {
+// // login as bburke
+// loginAndCheckSession(driver, loginPage);
+
+// // logout mposolda with admin client
+// Keycloak keycloakAdmin = Keycloak.getInstance(AUTH_SERVER_URL, "master", "admin", "admin", Constants.ADMIN_CONSOLE_CLIENT_ID);
+// ApiUtil.findClientByClientId(keycloakAdmin.realm("demo"), "session-portal").logoutUser("mposolda");
+
+// // bburke should be still logged with original httpSession in our browser window
+// driver.navigate().to(APP_SERVER_BASE_URL + "/session-portal");
+// Assert.assertEquals(driver.getCurrentUrl(), APP_SERVER_BASE_URL + "/session-portal" + slash);
+// String pageSource = driver.getPageSource();
+// Assert.assertTrue(pageSource.contains("Counter=3"));
+// }
/**
* KEYCLOAK-1216
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java
index 6283718..a10ce77 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/adapter/RelativeUriAdapterTest.java
@@ -26,7 +26,7 @@ import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.keycloak.OAuth2Constants;
-import org.keycloak.admin.client.Keycloak;
+//import org.keycloak.admin.client.Keycloak;
import org.keycloak.models.ClientModel;
import org.keycloak.models.ClientSessionModel;
import org.keycloak.models.Constants;
@@ -114,46 +114,46 @@ public class RelativeUriAdapterTest {
@WebResource
protected LoginPage loginPage;
- @Test
- public void testLoginSSOAndLogout() throws Exception {
- // test login to customer-portal which does a bearer request to customer-db
- driver.navigate().to("http://localhost:8081/customer-portal");
- Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
- loginPage.login("bburke@redhat.com", "password");
- Assert.assertEquals(driver.getCurrentUrl(), "http://localhost:8081/customer-portal");
- String pageSource = driver.getPageSource();
- Assert.assertTrue(pageSource.contains("Bill Burke") && pageSource.contains("Stian Thorgersen"));
-
- // test SSO
- driver.navigate().to("http://localhost:8081/product-portal");
- Assert.assertEquals(driver.getCurrentUrl(), "http://localhost:8081/product-portal");
- pageSource = driver.getPageSource();
- Assert.assertTrue(pageSource.contains("iPhone") && pageSource.contains("iPad"));
-
- // View stats
- List<Map<String, String>> stats = Keycloak.getInstance("http://localhost:8081/auth", "master", "admin", "admin", "security-admin-console").realm("demo").getClientSessionStats();
- Map<String, String> customerPortalStats = null;
- Map<String, String> productPortalStats = null;
- for (Map<String, String> s : stats) {
- if (s.get("clientId").equals("customer-portal")) {
- customerPortalStats = s;
- } else if (s.get("clientId").equals("product-portal")) {
- productPortalStats = s;
- }
- }
- Assert.assertEquals(1, Integer.parseInt(customerPortalStats.get("active")));
- Assert.assertEquals(1, Integer.parseInt(productPortalStats.get("active")));
-
- // test logout
- String logoutUri = OIDCLoginProtocolService.logoutUrl(UriBuilder.fromUri("http://localhost:8081/auth"))
- .queryParam(OAuth2Constants.REDIRECT_URI, "/customer-portal").build("demo").toString();
- driver.navigate().to(logoutUri);
- Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
- driver.navigate().to("http://localhost:8081/product-portal");
- Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
- driver.navigate().to("http://localhost:8081/customer-portal");
- Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
- }
+// @Test
+// public void testLoginSSOAndLogout() throws Exception {
+// // test login to customer-portal which does a bearer request to customer-db
+// driver.navigate().to("http://localhost:8081/customer-portal");
+// Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
+// loginPage.login("bburke@redhat.com", "password");
+// Assert.assertEquals(driver.getCurrentUrl(), "http://localhost:8081/customer-portal");
+// String pageSource = driver.getPageSource();
+// Assert.assertTrue(pageSource.contains("Bill Burke") && pageSource.contains("Stian Thorgersen"));
+
+// // test SSO
+// driver.navigate().to("http://localhost:8081/product-portal");
+// Assert.assertEquals(driver.getCurrentUrl(), "http://localhost:8081/product-portal");
+// pageSource = driver.getPageSource();
+// Assert.assertTrue(pageSource.contains("iPhone") && pageSource.contains("iPad"));
+
+// // View stats
+// List<Map<String, String>> stats = Keycloak.getInstance("http://localhost:8081/auth", "master", "admin", "admin", "security-admin-console").realm("demo").getClientSessionStats();
+// Map<String, String> customerPortalStats = null;
+// Map<String, String> productPortalStats = null;
+// for (Map<String, String> s : stats) {
+// if (s.get("clientId").equals("customer-portal")) {
+// customerPortalStats = s;
+// } else if (s.get("clientId").equals("product-portal")) {
+// productPortalStats = s;
+// }
+// }
+// Assert.assertEquals(1, Integer.parseInt(customerPortalStats.get("active")));
+// Assert.assertEquals(1, Integer.parseInt(productPortalStats.get("active")));
+
+// // test logout
+// String logoutUri = OIDCLoginProtocolService.logoutUrl(UriBuilder.fromUri("http://localhost:8081/auth"))
+// .queryParam(OAuth2Constants.REDIRECT_URI, "/customer-portal").build("demo").toString();
+// driver.navigate().to(logoutUri);
+// Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
+// driver.navigate().to("http://localhost:8081/product-portal");
+// Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
+// driver.navigate().to("http://localhost:8081/customer-portal");
+// Assert.assertTrue(driver.getCurrentUrl().startsWith(LOGIN_URL));
+// }
@Test
public void testServletRequestLogout() throws Exception {
diff --git a/testsuite/integration/src/test/java/org/keycloak/testsuite/saml/SamlBindingTest.java b/testsuite/integration/src/test/java/org/keycloak/testsuite/saml/SamlBindingTest.java
index d556a83..b472d86 100755
--- a/testsuite/integration/src/test/java/org/keycloak/testsuite/saml/SamlBindingTest.java
+++ b/testsuite/integration/src/test/java/org/keycloak/testsuite/saml/SamlBindingTest.java
@@ -3,6 +3,7 @@ package org.keycloak.testsuite.saml;
import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput;
import org.junit.Assert;
import org.junit.ClassRule;
+import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.keycloak.Config;
@@ -60,6 +61,7 @@ import java.io.InputStream;
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
* @version $Revision: 1 $
*/
+@Ignore
public class SamlBindingTest {
@ClassRule
testsuite/performance/pom.xml 5(+1 -4)
diff --git a/testsuite/performance/pom.xml b/testsuite/performance/pom.xml
index 368c37c..1c24fa6 100755
--- a/testsuite/performance/pom.xml
+++ b/testsuite/performance/pom.xml
@@ -199,17 +199,14 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>${h2.version}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>${hibernate.entitymanager.version}</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>${dom4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -259,4 +256,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
testsuite/pom.xml 16(+8 -8)
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 03e5787..a944b5f 100755
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -65,14 +65,14 @@
</build>
<modules>
<module>integration</module>
- <module>proxy</module>
- <module>tomcat6</module>
- <module>tomcat7</module>
- <module>tomcat8</module>
- <module>jetty/jetty81</module>
- <module>jetty/jetty92</module>
- <module>jetty/jetty91</module>
- <module>performance</module>
+ <!--<module>proxy</module>-->
+ <!--<module>tomcat6</module>-->
+ <!--<module>tomcat7</module>-->
+ <!--<module>tomcat8</module>-->
+ <!--<module>jetty/jetty81</module>-->
+ <!--<module>jetty/jetty92</module>-->
+ <!--<module>jetty/jetty91</module>-->
+ <!--<module>performance</module>-->
<!--<module>docker-cluster</module>-->
</modules>