keycloak-uncached
Changes
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/transactions/TransactionsTest.java 47(+29 -18)
testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/model/SimplePerfTest.java 92(+0 -92)
testsuite/jetty/jetty81/src/test/resources/adapter-test/customer-db/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/adapter-test/customer-db/WEB-INF/keycloak.json 10(+0 -10)
testsuite/jetty/jetty81/src/test/resources/adapter-test/customer-db-error-page/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/adapter-test/customer-db-error-page/WEB-INF/keycloak.json 10(+0 -10)
testsuite/jetty/jetty81/src/test/resources/adapter-test/customer-db-error-page/WEB-INF/web.xml 96(+0 -96)
testsuite/jetty/jetty81/src/test/resources/adapter-test/customer-portal/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/adapter-test/customer-portal/WEB-INF/keycloak.json 11(+0 -11)
testsuite/jetty/jetty81/src/test/resources/adapter-test/input-portal/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/adapter-test/input-portal/WEB-INF/keycloak.json 10(+0 -10)
testsuite/jetty/jetty81/src/test/resources/adapter-test/product-portal/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/adapter-test/product-portal/WEB-INF/keycloak.json 10(+0 -10)
testsuite/jetty/jetty81/src/test/resources/adapter-test/secure-portal/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/adapter-test/secure-portal/WEB-INF/keycloak.json 10(+0 -10)
testsuite/jetty/jetty81/src/test/resources/adapter-test/session-portal/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/adapter-test/session-portal/WEB-INF/keycloak.json 10(+0 -10)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml 60(+0 -60)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml 89(+0 -89)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/mappers/WEB-INF/keycloak-saml.xml 44(+0 -44)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/keycloak-saml.xml 63(+0 -63)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml 60(+0 -60)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-get/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-get/WEB-INF/keycloak-saml.xml 63(+0 -63)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/keycloak-saml.xml 63(+0 -63)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml 60(+0 -60)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml 60(+0 -60)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml 60(+0 -60)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-input/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-input/WEB-INF/keycloak-saml.xml 43(+0 -43)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-post/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-post/WEB-INF/keycloak-saml.xml 43(+0 -43)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-post2/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty81/src/test/resources/keycloak-saml/simple-post2/WEB-INF/keycloak-saml.xml 43(+0 -43)
testsuite/jetty/jetty91/src/test/resources/adapter-test/customer-db/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/adapter-test/customer-db/WEB-INF/keycloak.json 10(+0 -10)
testsuite/jetty/jetty91/src/test/resources/adapter-test/customer-db-error-page/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/adapter-test/customer-db-error-page/WEB-INF/keycloak.json 10(+0 -10)
testsuite/jetty/jetty91/src/test/resources/adapter-test/customer-db-error-page/WEB-INF/web.xml 96(+0 -96)
testsuite/jetty/jetty91/src/test/resources/adapter-test/customer-portal/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/adapter-test/customer-portal/WEB-INF/keycloak.json 11(+0 -11)
testsuite/jetty/jetty91/src/test/resources/adapter-test/input-portal/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/adapter-test/input-portal/WEB-INF/keycloak.json 10(+0 -10)
testsuite/jetty/jetty91/src/test/resources/adapter-test/product-portal/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/adapter-test/product-portal/WEB-INF/keycloak.json 10(+0 -10)
testsuite/jetty/jetty91/src/test/resources/adapter-test/secure-portal/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/adapter-test/secure-portal/WEB-INF/keycloak.json 10(+0 -10)
testsuite/jetty/jetty91/src/test/resources/adapter-test/session-portal/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/adapter-test/session-portal/WEB-INF/keycloak.json 10(+0 -10)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml 60(+0 -60)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/web.xml 87(+0 -87)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/mappers/WEB-INF/keycloak-saml.xml 44(+0 -44)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/keycloak-saml.xml 63(+0 -63)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/web.xml 60(+0 -60)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-get/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-get/WEB-INF/keycloak-saml.xml 63(+0 -63)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/keycloak-saml.xml 63(+0 -63)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/web.xml 60(+0 -60)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml 60(+0 -60)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/keystore.jks 0(+0 -0)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/web.xml 60(+0 -60)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-input/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-input/WEB-INF/keycloak-saml.xml 43(+0 -43)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-post/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-post/WEB-INF/keycloak-saml.xml 43(+0 -43)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-post2/WEB-INF/jetty-web.xml 46(+0 -46)
testsuite/jetty/jetty91/src/test/resources/keycloak-saml/simple-post2/WEB-INF/keycloak-saml.xml 43(+0 -43)
testsuite/jetty/pom.xml 2(+0 -2)
testsuite/pom.xml 1(+0 -1)
testsuite/tomcat6/src/test/resources/adapter-test/customer-db-error-page/META-INF/context.xml 20(+0 -20)
testsuite/tomcat6/src/test/resources/adapter-test/customer-db-error-page/WEB-INF/keycloak.json 10(+0 -10)
testsuite/tomcat6/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/tomcat6/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/keystore.jks 0(+0 -0)
testsuite/tomcat6/src/test/resources/keycloak-saml/bad-client-signed-post/WEB-INF/web.xml 60(+0 -60)
testsuite/tomcat6/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/tomcat6/src/test/resources/keycloak-saml/bad-realm-signed-post/WEB-INF/keystore.jks 0(+0 -0)
testsuite/tomcat6/src/test/resources/keycloak-saml/encrypted-post/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/tomcat6/src/test/resources/keycloak-saml/signed-front-get/WEB-INF/keycloak-saml.xml 63(+0 -63)
testsuite/tomcat6/src/test/resources/keycloak-saml/signed-metadata/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-email/WEB-INF/keycloak-saml.xml 63(+0 -63)
testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/keystore.jks 0(+0 -0)
testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-persistent/WEB-INF/web.xml 60(+0 -60)
testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/keycloak-saml.xml 64(+0 -64)
testsuite/tomcat6/src/test/resources/keycloak-saml/signed-post-transient/WEB-INF/keystore.jks 0(+0 -0)
testsuite/tomcat6/src/test/resources/keycloak-saml/simple-input/WEB-INF/keycloak-saml.xml 43(+0 -43)
testsuite/tomcat6/src/test/resources/keycloak-saml/simple-post2/WEB-INF/keycloak-saml.xml 43(+0 -43)
travis-run-tests.sh 1(+0 -1)
Details
diff --git a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/ApiUtil.java b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/ApiUtil.java
index bdaf10b..b2fdf8f 100644
--- a/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/ApiUtil.java
+++ b/testsuite/integration-deprecated/src/test/java/org/keycloak/testsuite/ApiUtil.java
@@ -17,29 +17,12 @@
package org.keycloak.testsuite;
import org.jboss.logging.Logger;
-import org.keycloak.admin.client.resource.AuthorizationResource;
-import org.keycloak.admin.client.resource.ClientResource;
-import org.keycloak.admin.client.resource.RealmResource;
-import org.keycloak.admin.client.resource.RoleResource;
-import org.keycloak.admin.client.resource.UserResource;
-import org.keycloak.representations.idm.ClientRepresentation;
-import org.keycloak.representations.idm.CredentialRepresentation;
-import org.keycloak.representations.idm.GroupRepresentation;
-import org.keycloak.representations.idm.KeysMetadataRepresentation;
-import org.keycloak.representations.idm.ProtocolMapperRepresentation;
-import org.keycloak.representations.idm.RoleRepresentation;
-import org.keycloak.representations.idm.UserRepresentation;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.Response.StatusType;
import java.net.URI;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.keycloak.representations.idm.CredentialRepresentation.PASSWORD;
/**
* @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc.
@@ -62,157 +45,4 @@ public class ApiUtil {
return path.substring(path.lastIndexOf('/') + 1);
}
- public static ClientResource findClientResourceById(RealmResource realm, String id) {
- for (ClientRepresentation c : realm.clients().findAll()) {
- if (c.getId().equals(id)) {
- return realm.clients().get(c.getId());
- }
- }
- return null;
- }
-
- public static ClientResource findClientResourceByClientId(RealmResource realm, String clientId) {
- for (ClientRepresentation c : realm.clients().findAll()) {
- if (c.getClientId().equals(clientId)) {
- return realm.clients().get(c.getId());
- }
- }
- return null;
- }
-
- public static ClientResource findClientResourceByName(RealmResource realm, String name) {
- for (ClientRepresentation c : realm.clients().findAll()) {
- if (c.getName().equals(name)) {
- return realm.clients().get(c.getId());
- }
- }
- return null;
- }
-
- public static ClientResource findClientByClientId(RealmResource realm, String clientId) {
- for (ClientRepresentation c : realm.clients().findAll()) {
- if (c.getClientId().equals(clientId)) {
- return realm.clients().get(c.getId());
- }
- }
- return null;
- }
-
- public static RoleResource findClientRoleByName(ClientResource client, String role) {
- return client.roles().get(role);
- }
-
- public static ProtocolMapperRepresentation findProtocolMapperByName(ClientResource client, String name) {
- for (ProtocolMapperRepresentation p : client.getProtocolMappers().getMappers()) {
- if (p.getName().equals(name)) {
- return p;
- }
- }
- return null;
- }
-
- public static RoleResource findRealmRoleByName(RealmResource realm, String role) {
- return realm.roles().get(role);
- }
-
- public static UserRepresentation findUserByUsername(RealmResource realm, String username) {
- UserRepresentation user = null;
- List<UserRepresentation> ur = realm.users().search(username, null, null);
- if (ur.size() == 1) {
- user = ur.get(0);
- }
-
- if (ur.size() > 1) { // try to be more specific
- for (UserRepresentation rep : ur) {
- if (rep.getUsername().equalsIgnoreCase(username)) return rep;
- }
- }
-
- return user;
- }
-
- public static UserResource findUserByUsernameId(RealmResource realm, String username) {
- return realm.users().get(findUserByUsername(realm, username).getId());
- }
-
- public static String createUserWithAdminClient(RealmResource realm, UserRepresentation user) {
- Response response = realm.users().create(user);
- String createdId = getCreatedId(response);
- response.close();
- return createdId;
- }
-
- public static String createUserAndResetPasswordWithAdminClient(RealmResource realm, UserRepresentation user, String password) {
- String id = createUserWithAdminClient(realm, user);
- resetUserPassword(realm.users().get(id), password, false);
- return id;
- }
-
- public static void resetUserPassword(UserResource userResource, String newPassword, boolean temporary) {
- CredentialRepresentation newCredential = new CredentialRepresentation();
- newCredential.setType(PASSWORD);
- newCredential.setValue(newPassword);
- newCredential.setTemporary(temporary);
- userResource.resetPassword(newCredential);
- }
-
- public static void assignClientRoles(RealmResource realm, String userId, String clientName, String... roles) {
- String realmName = realm.toRepresentation().getRealm();
- String clientId = "";
- for (ClientRepresentation clientRepresentation : realm.clients().findAll()) {
- if (clientRepresentation.getClientId().equals(clientName)) {
- clientId = clientRepresentation.getId();
- }
- }
-
- if (!clientId.isEmpty()) {
- ClientResource clientResource = realm.clients().get(clientId);
-
- List<RoleRepresentation> roleRepresentations = new ArrayList<>();
- for (String roleName : roles) {
- RoleRepresentation role = clientResource.roles().get(roleName).toRepresentation();
- roleRepresentations.add(role);
- }
-
- UserResource userResource = realm.users().get(userId);
- log.debug("assigning role: " + Arrays.toString(roles) + " to user: \""
- + userResource.toRepresentation().getUsername() + "\" of client: \""
- + clientName + "\" in realm: \"" + realmName + "\"");
- userResource.roles().clientLevel(clientId).add(roleRepresentations);
- } else {
- log.warn("client with name " + clientName + " doesn't exist in realm " + realmName);
- }
- }
-
- public static boolean groupContainsSubgroup(GroupRepresentation group, GroupRepresentation subgroup) {
- boolean contains = false;
- for (GroupRepresentation sg : group.getSubGroups()) {
- if (subgroup.getId().equals(sg.getId())) {
- contains = true;
- break;
- }
- }
- return contains;
- }
-
- public static AuthorizationResource findAuthorizationSettings(RealmResource realm, String clientId) {
- for (ClientRepresentation c : realm.clients().findAll()) {
- if (c.getClientId().equals(clientId)) {
- return realm.clients().get(c.getId()).authorization();
- }
- }
- return null;
- }
-
- public static KeysMetadataRepresentation.KeyMetadataRepresentation findActiveKey(RealmResource realm) {
- KeysMetadataRepresentation keyMetadata = realm.keys().getKeyMetadata();
- String activeKid = keyMetadata.getActive().get("RSA");
- for (KeysMetadataRepresentation.KeyMetadataRepresentation rep : keyMetadata.getKeys()) {
- if (rep.getKid().equals(activeKid)) {
- return rep;
- }
- }
- return null;
- }
-
}
testsuite/jetty/pom.xml 2(+0 -2)
diff --git a/testsuite/jetty/pom.xml b/testsuite/jetty/pom.xml
index f8fc0bb..f8d386e 100755
--- a/testsuite/jetty/pom.xml
+++ b/testsuite/jetty/pom.xml
@@ -31,8 +31,6 @@
<packaging>pom</packaging>
<modules>
- <module>jetty81</module>
- <module>jetty91</module>
<module>jetty92</module>
<module>jetty93</module>
<module>jetty94</module>
testsuite/pom.xml 1(+0 -1)
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index fe40105..2211a7d 100755
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -71,7 +71,6 @@
<modules>
<module>jetty</module>
<module>proxy</module>
- <module>tomcat6</module>
<module>tomcat7</module>
</modules>
</profile>
travis-run-tests.sh 1(+0 -1)
diff --git a/travis-run-tests.sh b/travis-run-tests.sh
index 6a083a0..eed23db 100755
--- a/travis-run-tests.sh
+++ b/travis-run-tests.sh
@@ -50,7 +50,6 @@ if [ $1 == "old" ]; then
mvn test -B -nsu -f integration-deprecated
mvn test -B -nsu -f jetty
mvn test -B -nsu -f proxy
- mvn test -B -nsu -f tomcat6
mvn test -B -nsu -f tomcat7
mvn test -B -nsu -f tomcat8
fi