diff --git a/benchmark/pom.xml b/benchmark/pom.xml index 8c2884eaf..a7f71b346 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -4,7 +4,7 @@ org.keycloak.benchmark keycloak-benchmark - 0.9-SNAPSHOT + 0.10-SNAPSHOT 2.12.10 diff --git a/dataset/pom.xml b/dataset/pom.xml index 970a1e6e8..57356ab50 100644 --- a/dataset/pom.xml +++ b/dataset/pom.xml @@ -4,7 +4,7 @@ keycloak-benchmark-parent org.keycloak - 0.9-SNAPSHOT + 0.10-SNAPSHOT ../pom.xml 4.0.0 @@ -33,30 +33,12 @@ org.keycloak keycloak-services provided - - - - resteasy-multipart-provider - org.jboss.resteasy - - org.keycloak keycloak-model-infinispan provided - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec - - - org.jboss.resteasy - resteasy-core - junit junit diff --git a/dataset/src/main/java/org/keycloak/benchmark/cache/CacheResource.java b/dataset/src/main/java/org/keycloak/benchmark/cache/CacheResource.java index 6e76161cf..110ff5d37 100644 --- a/dataset/src/main/java/org/keycloak/benchmark/cache/CacheResource.java +++ b/dataset/src/main/java/org/keycloak/benchmark/cache/CacheResource.java @@ -20,11 +20,11 @@ import java.util.UUID; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.infinispan.Cache; import org.infinispan.commons.CacheConfigurationException; diff --git a/dataset/src/main/java/org/keycloak/benchmark/cache/CacheResourceProvider.java b/dataset/src/main/java/org/keycloak/benchmark/cache/CacheResourceProvider.java index 703f8475b..7208667b1 100644 --- a/dataset/src/main/java/org/keycloak/benchmark/cache/CacheResourceProvider.java +++ b/dataset/src/main/java/org/keycloak/benchmark/cache/CacheResourceProvider.java @@ -22,10 +22,10 @@ import java.util.Map; import java.util.stream.Stream; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.infinispan.Cache; import org.infinispan.client.hotrod.RemoteCache; diff --git a/dataset/src/main/java/org/keycloak/benchmark/cache/RemoteCacheResource.java b/dataset/src/main/java/org/keycloak/benchmark/cache/RemoteCacheResource.java index 6affaa528..181885289 100644 --- a/dataset/src/main/java/org/keycloak/benchmark/cache/RemoteCacheResource.java +++ b/dataset/src/main/java/org/keycloak/benchmark/cache/RemoteCacheResource.java @@ -20,11 +20,11 @@ import java.util.UUID; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; import org.infinispan.Cache; import org.infinispan.client.hotrod.RemoteCache; diff --git a/dataset/src/main/java/org/keycloak/benchmark/cache/RemoteCacheResourceProvider.java b/dataset/src/main/java/org/keycloak/benchmark/cache/RemoteCacheResourceProvider.java index e797de04b..92095eb96 100644 --- a/dataset/src/main/java/org/keycloak/benchmark/cache/RemoteCacheResourceProvider.java +++ b/dataset/src/main/java/org/keycloak/benchmark/cache/RemoteCacheResourceProvider.java @@ -18,8 +18,8 @@ package org.keycloak.benchmark.cache; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.keycloak.models.KeycloakSession; import org.keycloak.services.resource.RealmResourceProvider; diff --git a/dataset/src/main/java/org/keycloak/benchmark/dataset/AuthorizationProvisioner.java b/dataset/src/main/java/org/keycloak/benchmark/dataset/AuthorizationProvisioner.java index 39f125f89..bdfb68c4b 100644 --- a/dataset/src/main/java/org/keycloak/benchmark/dataset/AuthorizationProvisioner.java +++ b/dataset/src/main/java/org/keycloak/benchmark/dataset/AuthorizationProvisioner.java @@ -7,11 +7,11 @@ import java.util.List; import java.util.Random; import java.util.Set; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.annotations.cache.NoCache; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; diff --git a/dataset/src/main/java/org/keycloak/benchmark/dataset/DatasetResourceProvider.java b/dataset/src/main/java/org/keycloak/benchmark/dataset/DatasetResourceProvider.java index e50546993..cd53b13f7 100644 --- a/dataset/src/main/java/org/keycloak/benchmark/dataset/DatasetResourceProvider.java +++ b/dataset/src/main/java/org/keycloak/benchmark/dataset/DatasetResourceProvider.java @@ -35,13 +35,13 @@ import java.util.Collections; import java.util.stream.Collectors; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; import org.jboss.logging.Logger; import org.jboss.resteasy.annotations.cache.NoCache; @@ -57,6 +57,7 @@ import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.models.KeycloakUriInfo; import org.keycloak.models.PasswordPolicy; import org.keycloak.models.RealmModel; import org.keycloak.models.RealmProvider; @@ -87,7 +88,7 @@ public class DatasetResourceProvider implements RealmResourceProvider { protected HttpRequest httpRequest; - protected UriInfo uriInfo; + protected KeycloakUriInfo uriInfo; public DatasetResourceProvider(KeycloakSession session) { this.baseSession = session; diff --git a/dataset/src/test/java/org/keycloak/benchmark/it/DeploymentIT.java b/dataset/src/test/java/org/keycloak/benchmark/it/DeploymentIT.java index c405b36be..7ed9d0b8e 100644 --- a/dataset/src/test/java/org/keycloak/benchmark/it/DeploymentIT.java +++ b/dataset/src/test/java/org/keycloak/benchmark/it/DeploymentIT.java @@ -187,7 +187,7 @@ private Process startKeycloak(Path keycloakProvidersFolder, String[] args) throw Assert.assertTrue(executable.toFile().exists()); cli.add(executable.toString()); } - cli.addAll(Arrays.asList("start-dev", "--http-port", Integer.toString(port))); + cli.addAll(Arrays.asList("--verbose", "start-dev", "--http-port", Integer.toString(port))); cli.addAll(Arrays.asList(args)); ProcessBuilder processBuilder = new ProcessBuilder(cli); processBuilder.environment().put("KEYCLOAK_ADMIN", "admin"); diff --git a/doc/dataset/modules/ROOT/nav.adoc b/doc/dataset/modules/ROOT/nav.adoc index 179e05b7d..7de6a10db 100644 --- a/doc/dataset/modules/ROOT/nav.adoc +++ b/doc/dataset/modules/ROOT/nav.adoc @@ -4,7 +4,6 @@ * xref:installing-provider.adoc[] ** xref:installation/installation-quarkus.adoc[] ** xref:installation/installation-minikube.adoc[] -** xref:installation/installation-wildfly.adoc[] * xref:using-provider.adoc[] * xref:clearing-caches.adoc[] * xref:changing-provider.adoc[] diff --git a/doc/dataset/modules/ROOT/pages/installation/installation-wildfly.adoc b/doc/dataset/modules/ROOT/pages/installation/installation-wildfly.adoc deleted file mode 100644 index 784ccb7c9..000000000 --- a/doc/dataset/modules/ROOT/pages/installation/installation-wildfly.adoc +++ /dev/null @@ -1,52 +0,0 @@ -= Installing the dataset provider in a Keycloak Wildfly distribution (legacy) -:description: This installs the provider into an already running Keycloak distribution running on Wildfly. -:navtitle: Installing on Keycloak Wildfly - -{description} -Note that Keycloak Wildfly is only supported up to and including Version Keycloak 19. -Later versions only support Keycloak Quarkus. -See xref:installation/installation-quarkus.adoc[] for more information. - -include::partial$warning-not-in-production.adoc[] - -== Prerequisites - -One of the following: - -* xref:downloading-provider.adoc[] -* xref:building-provider.adoc[] - -== Installing the dataset provider on Wildfly - -Copy the previously built or downloaded JAR file to the Keycloak folder: - ----- -cp dataset/target/keycloak-benchmark-dataset-*.jar $KEYCLOAK_HOME/standalone/deployments/ ----- - -Instead of copying to `standalone/deployments`, the alternative is to deploy as a module - ----- -$KEYCLOAK_HOME/bin/jboss-cli.sh --command="module add --name=org.keycloak.keycloak-benchmark --resources=$JAR_NAME --dependencies=org.keycloak.keycloak-common,org.keycloak.keycloak-core,org.keycloak.keycloak-server-spi,org.keycloak.keycloak-server-spi-private,org.keycloak.keycloak-services,org.keycloak.keycloak-model-infinispan,javax.ws.rs.api,org.jboss.resteasy.resteasy-jaxrs,org.jboss.logging,org.infinispan,org.infinispan.commons,org.infinispan.client.hotrod,org.infinispan.persistence.remote" ----- - -Then in the file `$KEYCLOAK_HOME/standalone/configuration/standalone.xml` add this additional line to the `providers` element of keycloak server subsystem: - ----- -module:org.keycloak.keycloak-benchmark ----- - -== Verifying the installation - -To verify the installation, access the URL of your Keycloak server at: - ----- -http://example.org/auth/realms/master/dataset/status ----- - -On successful installation, it shows a message similar to: - ----- -{"status":"No task in progress. New task can be started"} ----- - diff --git a/doc/dataset/modules/ROOT/pages/installing-provider.adoc b/doc/dataset/modules/ROOT/pages/installing-provider.adoc index 3e98d28cd..eaa49c547 100644 --- a/doc/dataset/modules/ROOT/pages/installing-provider.adoc +++ b/doc/dataset/modules/ROOT/pages/installing-provider.adoc @@ -13,6 +13,5 @@ A fully scripted installation to be run on a single machine. xref:installation/installation-quarkus.adoc[]:: A custom installation on Keycloak for Quarkus. -xref:installation/installation-wildfly.adoc[]:: -A custom installation on Keycloak for Wildfly. - +Installing on Keycloak with a Wildfly distribution is not support from version 0.10 onwards. +Use a version 0.9 or earlier of this project. diff --git a/pom.xml b/pom.xml index 35e30abbe..11e886e6e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.keycloak keycloak-benchmark-parent - 0.9-SNAPSHOT + 0.10-SNAPSHOT pom Keycloak Benchmark Parent @@ -11,11 +11,9 @@ 999.0.0-SNAPSHOT - 2.0.1.Final 4.13.2 11 UTF-8 - 4.7.4.Final 11 UTF-8 @@ -59,16 +57,6 @@ keycloak-model-infinispan ${keycloak.version} - - org.jboss.resteasy - resteasy-core - ${resteasy.version} - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec - ${jboss-jaxrs-api_2.1_spec} - junit junit