diff --git a/.gitignore b/.gitignore index d789ca365e..07cea2f4ca 100644 --- a/.gitignore +++ b/.gitignore @@ -78,7 +78,7 @@ quarkus/data/*.db # Jakarta transformed sources # ############################### -/integration/admin-client-jakarta/src/ +/integration/admin-client/src/ /adapters/saml/jakarta-servlet-filter/src/ /adapters/oidc/jakarta-servlet-filter/src/ /adapters/saml/wildfly-elytron-jakarta/src/ diff --git a/examples/admin-client/pom.xml b/examples/admin-client/pom.xml index a0420ecaa0..713d1db1d7 100755 --- a/examples/admin-client/pom.xml +++ b/examples/admin-client/pom.xml @@ -36,7 +36,7 @@ org.keycloak - keycloak-admin-client + keycloak-admin-client-jee diff --git a/integration/admin-client-jakarta/pom.xml b/integration/admin-client-jakarta/pom.xml deleted file mode 100755 index 73ebb9c177..0000000000 --- a/integration/admin-client-jakarta/pom.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - keycloak-integration-parent - org.keycloak - 999.0.0-SNAPSHOT - - 4.0.0 - - keycloak-admin-client-jakarta - Keycloak Admin REST Client for Jakarta packages - - - - 6.2.3.Final - - ${project.basedir}/../admin-client/src - ${project.basedir}/src - - - - - org.keycloak - keycloak-core - - - * - * - - - - - org.keycloak - keycloak-common - - - * - * - - - - - org.jboss.resteasy - resteasy-client - ${resteasy.versions} - - - org.jboss.resteasy - resteasy-multipart-provider - ${resteasy.versions} - - - org.jboss.resteasy - resteasy-jackson2-provider - ${resteasy.versions} - - - org.jboss.resteasy - resteasy-jaxb-provider - ${resteasy.versions} - - - - - - - maven-antrun-plugin - 3.0.0 - - - transform - initialize - - run - - - - - - - - - - - - - - - - - - - org.eclipse.transformer - org.eclipse.transformer.cli - 0.2.0 - - - ant-contrib - ant-contrib - 1.0b3 - - - ant - ant - - - - - - - - - diff --git a/integration/admin-client-jee/pom.xml b/integration/admin-client-jee/pom.xml new file mode 100755 index 0000000000..510faebcaf --- /dev/null +++ b/integration/admin-client-jee/pom.xml @@ -0,0 +1,80 @@ + + + + + + keycloak-integration-parent + org.keycloak + 999.0.0-SNAPSHOT + + 4.0.0 + + keycloak-admin-client-jee + Keycloak Admin REST Client JavaEE + + + + ${resteasy-legacy.version} + + + + + org.keycloak + keycloak-core + + + * + * + + + + + org.keycloak + keycloak-common + + + * + * + + + + + org.jboss.resteasy + resteasy-client + ${resteasy.version} + + + org.jboss.resteasy + resteasy-multipart-provider + ${resteasy.version} + + + org.jboss.resteasy + resteasy-jackson2-provider + ${resteasy.version} + + + org.jboss.resteasy + resteasy-jaxb-provider + ${resteasy.version} + + + + diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java similarity index 96% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java index eb446b7d1e..589bec338e 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java @@ -1,7 +1,7 @@ package org.keycloak.admin.client; import javax.net.ssl.SSLContext; -import jakarta.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.ClientBuilder; public class ClientBuilderWrapper { diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/Config.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/Config.java similarity index 100% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/Config.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/Config.java diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java similarity index 96% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java index 1111783965..9596b225b8 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java @@ -16,8 +16,8 @@ */ package org.keycloak.admin.client; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Response; import java.net.URI; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/JacksonProvider.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/JacksonProvider.java similarity index 100% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/JacksonProvider.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/JacksonProvider.java diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/Keycloak.java similarity index 99% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/Keycloak.java index 3415791e8d..d9338fb84a 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/Keycloak.java @@ -16,7 +16,7 @@ */ package org.keycloak.admin.client; -import jakarta.ws.rs.client.WebTarget; +import javax.ws.rs.client.WebTarget; import org.keycloak.admin.client.resource.BearerAuthFilter; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.RealmsResource; @@ -25,7 +25,7 @@ import org.keycloak.admin.client.spi.ResteasyClientProvider; import org.keycloak.admin.client.token.TokenManager; import javax.net.ssl.SSLContext; -import jakarta.ws.rs.client.Client; +import javax.ws.rs.client.Client; import java.net.URI; import java.util.Iterator; import java.util.ServiceLoader; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java similarity index 96% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java index ca146e1a16..c7c3399437 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java @@ -20,11 +20,11 @@ package org.keycloak.admin.client; import static org.keycloak.OAuth2Constants.CLIENT_CREDENTIALS; import static org.keycloak.OAuth2Constants.PASSWORD; -import jakarta.ws.rs.client.Client; +import javax.ws.rs.client.Client; /** * Provides a {@link Keycloak} client builder with the ability to customize the underlying - * {@link jakarta.ws.rs.client.Client RESTEasy client} used to communicate with the Keycloak server. + * {@link javax.ws.rs.client.Client RESTEasy client} used to communicate with the Keycloak server. *

*

Example usage with a connection pool size of 20:

* 
@@ -50,7 +50,7 @@ import jakarta.ws.rs.client.Client;
  *
* * @author Scott Rossillo - * @see jakarta.ws.rs.client.Client + * @see javax.ws.rs.client.Client */ public class KeycloakBuilder { private String serverUrl; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java similarity index 82% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java index 66dd2ad8a5..0c1f0664b1 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AggregatePoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.AggregatePolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java similarity index 89% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java index 1b4a2ca92f..695afc384a 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AggregatePolicyResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.AggregatePolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java similarity index 87% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java index 1aee3f3aa2..1168bc0f8b 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java @@ -17,12 +17,12 @@ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import java.util.Map; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java similarity index 95% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java index 10292c763a..b549f49050 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java @@ -26,16 +26,16 @@ import org.keycloak.representations.idm.ConfigPropertyRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.RequiredActionProviderSimpleRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java similarity index 87% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java index 6085632bb1..de8d958ab7 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java @@ -18,14 +18,14 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; /** * @author Pedro Igor diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java similarity index 91% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java index 72e9dd050d..f4750b6b6c 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java @@ -17,9 +17,9 @@ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.client.ClientRequestContext; -import jakarta.ws.rs.client.ClientRequestFilter; -import jakarta.ws.rs.core.HttpHeaders; +import javax.ws.rs.client.ClientRequestContext; +import javax.ws.rs.client.ClientRequestFilter; +import javax.ws.rs.core.HttpHeaders; import java.io.IOException; import org.keycloak.common.util.Base64; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java similarity index 91% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java index 6d9527e4fb..0d4992fcfc 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java @@ -19,11 +19,11 @@ package org.keycloak.admin.client.resource; import org.keycloak.admin.client.token.TokenManager; -import jakarta.ws.rs.client.ClientRequestContext; -import jakarta.ws.rs.client.ClientRequestFilter; -import jakarta.ws.rs.client.ClientResponseContext; -import jakarta.ws.rs.client.ClientResponseFilter; -import jakarta.ws.rs.core.HttpHeaders; +import javax.ws.rs.client.ClientRequestContext; +import javax.ws.rs.client.ClientRequestFilter; +import javax.ws.rs.client.ClientResponseContext; +import javax.ws.rs.client.ClientResponseFilter; +import javax.ws.rs.core.HttpHeaders; import java.io.IOException; import java.util.List; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java similarity index 94% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java index 02e47e6e53..3934975f58 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java @@ -20,12 +20,12 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.KeyStoreConfig; import org.keycloak.representations.idm.CertificateRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; /** * diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java similarity index 85% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java index 8594d2eeba..54dba868b1 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java @@ -20,14 +20,14 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.ClientInitialAccessCreatePresentation; import org.keycloak.representations.idm.ClientInitialAccessPresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java similarity index 76% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java index 3daee1b33e..66b683ba79 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java @@ -1,10 +1,10 @@ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import org.keycloak.representations.idm.ClientPoliciesRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java similarity index 80% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java index fe3b611926..6c71dcecba 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesProfilesResource.java @@ -1,11 +1,11 @@ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; import org.keycloak.representations.idm.ClientProfilesRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java similarity index 82% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java index d4be914c3c..72c35c2028 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java similarity index 89% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java index 15409081b9..5f330d3dfe 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientPolicyResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java similarity index 89% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java index bff3cc100d..9d6f41cae8 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientRegistrationPolicyResource.java @@ -19,10 +19,10 @@ package org.keycloak.admin.client.resource; import java.util.List; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import org.keycloak.representations.idm.ComponentTypeRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientResource.java similarity index 95% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientResource.java index 7e7ce97a80..4097c5ed87 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientResource.java @@ -20,16 +20,16 @@ package org.keycloak.admin.client.resource; import java.util.List; import java.util.Map; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; import org.keycloak.representations.adapters.action.GlobalRequestResult; import org.keycloak.representations.idm.ClientRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java similarity index 83% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java index 273508bfc1..3d753c20e8 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopePoliciesResource.java @@ -16,14 +16,14 @@ */ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.ClientScopePolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java similarity index 85% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java index 04f7654f21..11fbf5e73f 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java @@ -19,13 +19,13 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.ClientScopeRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java similarity index 83% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java index 203525b3c6..2df8978d43 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java @@ -19,14 +19,14 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.ClientScopeRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java similarity index 88% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java index ca9a6cad10..8cec12eef5 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java @@ -19,15 +19,15 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.ClientRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java similarity index 87% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java index 5346e4faa8..7fc040fd27 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java @@ -21,14 +21,14 @@ import java.util.List; import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.ComponentTypeRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; /** * @author Bill Burke diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java similarity index 85% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java index 96c630fbc6..235b34c845 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java @@ -18,16 +18,16 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.ComponentRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java similarity index 82% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java index be10893de0..071cfcf892 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupPoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.GroupPolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java similarity index 89% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java index 697a35f38c..9713493804 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupPolicyResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.GroupPolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupResource.java similarity index 93% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupResource.java index 4048218f7f..1075f0486d 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupResource.java @@ -22,16 +22,16 @@ import org.keycloak.representations.idm.ManagementPermissionReference; import org.keycloak.representations.idm.ManagementPermissionRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java similarity index 98% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java index 671e25c108..422709c66f 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java @@ -19,9 +19,9 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.GroupRepresentation; -import jakarta.ws.rs.*; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.*; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java similarity index 87% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java index c16a0fe9ce..a2a3e45dbe 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java @@ -21,17 +21,17 @@ import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import org.keycloak.representations.idm.IdentityProviderMapperTypeRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java similarity index 88% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java index 22fe76a01c..ebc31339c8 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java @@ -19,14 +19,14 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.IdentityProviderRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; import java.util.Map; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java similarity index 82% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java index 7b4780e1fe..62daa38475 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/JSPoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.JSPolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java similarity index 89% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java index 7059856b3f..78caa39617 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/JSPolicyResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.JSPolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/KeyResource.java similarity index 91% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/KeyResource.java index 40b3f66879..aeb1fdb5af 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/KeyResource.java @@ -19,9 +19,9 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.KeysMetadataRepresentation; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.GET; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java similarity index 97% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java index 3de81d73fd..679137bda9 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PermissionsResource.java @@ -16,7 +16,7 @@ */ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Path; +import javax.ws.rs.Path; /** * @author Pedro Igor diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java similarity index 91% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java index b9dace649a..9eed5e9906 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java @@ -21,15 +21,15 @@ import org.keycloak.representations.idm.authorization.PolicyEvaluationResponse; import org.keycloak.representations.idm.authorization.PolicyProviderRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java similarity index 89% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java index 6a8d746502..00550230fb 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/PolicyResource.java @@ -18,14 +18,14 @@ package org.keycloak.admin.client.resource; import java.util.List; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java similarity index 87% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java index ee7bbb0921..d7dd1419e0 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java @@ -19,15 +19,15 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.ProtocolMapperRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java similarity index 86% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java index d98768b4f9..b26dc7fb6e 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmLocalizationResource.java @@ -20,16 +20,16 @@ package org.keycloak.admin.client.resource; import java.util.List; import java.util.Map; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; public interface RealmLocalizationResource { diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmResource.java similarity index 95% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmResource.java index 99e1fa6623..40293fb70b 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmResource.java @@ -29,18 +29,18 @@ import org.keycloak.representations.idm.RealmEventsConfigRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.TestLdapConnectionRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.FormParam; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.FormParam; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; import java.util.Map; @@ -230,7 +230,7 @@ public interface RealmResource { @POST @Path("ldap-server-capabilities") @Consumes(MediaType.APPLICATION_JSON) - @Produces(jakarta.ws.rs.core.MediaType.APPLICATION_JSON) + @Produces(javax.ws.rs.core.MediaType.APPLICATION_JSON) List ldapServerCapabilities(TestLdapConnectionRepresentation config); @Path("testSMTPConnection") diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java similarity index 85% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java index 9b0adf2d63..d20be9f8cc 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java @@ -19,13 +19,13 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.RealmRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java similarity index 87% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java index fef3c57641..10574e21d0 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RegexPoliciesResource.java @@ -16,11 +16,11 @@ */ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.POST; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.RegexPolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java similarity index 89% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java index 4671c8e930..f2bb6d8cfa 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java similarity index 82% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java index f94d01c7f6..e77377bdb7 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcePermissionsResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java similarity index 86% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java index 49cd2e2eb9..9c3a73ea8a 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java @@ -21,13 +21,13 @@ import java.util.List; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; /** * @author Pedro Igor diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java similarity index 86% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java index 276a53eb11..60efbf6ad7 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java @@ -21,13 +21,13 @@ import java.util.List; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; /** * @author Pedro Igor diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java similarity index 83% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java index 2746e9e295..7e3f2d1179 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java @@ -18,15 +18,15 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java similarity index 87% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java index 0be045759b..dcf05a0c63 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java @@ -18,15 +18,15 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.authorization.ResourceRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java similarity index 90% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java index 0de55c0985..b594dbc475 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java @@ -19,16 +19,16 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.RoleRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; import java.util.List; import java.util.Set; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java similarity index 86% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java index e25fe13c62..bb68f21938 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java @@ -19,12 +19,12 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.MappingsRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java similarity index 82% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java index 86c025deae..be834f39f2 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolePoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.RolePolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java similarity index 89% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java index bc98fb1f72..b3be353f09 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolePolicyResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleResource.java similarity index 95% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleResource.java index 351a324701..f5604c51af 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleResource.java @@ -23,16 +23,16 @@ import org.keycloak.representations.idm.ManagementPermissionRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; import java.util.List; import java.util.Set; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java similarity index 84% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java index 3e59b386c9..cfba5e76e1 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java @@ -19,15 +19,15 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.RoleRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.DefaultValue; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolesResource.java similarity index 93% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolesResource.java index f76f9ae354..4547a93e59 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/RolesResource.java @@ -19,16 +19,16 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.RoleRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.DefaultValue; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; import java.util.List; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java similarity index 90% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java index cb0d9d3af5..99fa30b3e7 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ScopePermissionResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java similarity index 82% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java index d38df84c4d..e130960e50 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ScopePermissionsResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java similarity index 89% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java index abbb4e92d5..61bc6eef75 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java @@ -19,10 +19,10 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.info.ServerInfoRepresentation; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; /** * @author Stian Thorgersen diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java similarity index 82% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java index 919c1d5280..5bc03e03fb 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/TimePoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.TimePolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java similarity index 89% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java index 2184c63771..acad51a686 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/TimePolicyResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java similarity index 82% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java index 3d019d8e25..b5f7f74d25 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserPoliciesResource.java @@ -16,15 +16,15 @@ */ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import org.keycloak.representations.idm.authorization.UserPolicyRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java similarity index 89% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java index 8e33486c8b..7856378642 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserPolicyResource.java @@ -18,13 +18,13 @@ package org.keycloak.admin.client.resource; import java.util.List; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java similarity index 85% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java index b6fab1aa7b..a9475a058f 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserProfileResource.java @@ -16,12 +16,12 @@ */ package org.keycloak.admin.client.resource; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; /** * @author Vlastimil Elias diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserResource.java similarity index 96% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserResource.java index 5198ea78f0..15cb0bed6b 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserResource.java @@ -23,18 +23,18 @@ import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.UserSessionRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.DefaultValue; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; import java.util.Map; @@ -137,7 +137,7 @@ public interface UserResource { * Update a credential label for a user */ @PUT - @Consumes(jakarta.ws.rs.core.MediaType.TEXT_PLAIN) + @Consumes(javax.ws.rs.core.MediaType.TEXT_PLAIN) @Path("credentials/{credentialId}/userLabel") void setCredentialUserLabel(final @PathParam("credentialId") String credentialId, String userLabel); diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java similarity index 93% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java index 8b38dfd9d4..d382007b30 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java @@ -18,12 +18,12 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.SynchronizationResultRepresentation; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; /** * @author Bill Burke diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UsersResource.java similarity index 98% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UsersResource.java index 0616e6b878..481516293c 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/resource/UsersResource.java @@ -19,16 +19,16 @@ package org.keycloak.admin.client.resource; import org.keycloak.representations.idm.UserRepresentation; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import java.util.List; public interface UsersResource { diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java similarity index 93% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java index 7c69e2e405..f5df72ded0 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java @@ -18,9 +18,9 @@ package org.keycloak.admin.client.spi; import javax.net.ssl.SSLContext; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.client.ClientBuilder; -import jakarta.ws.rs.client.WebTarget; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; +import javax.ws.rs.client.WebTarget; import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; import org.keycloak.admin.client.ClientBuilderWrapper; import org.keycloak.admin.client.JacksonProvider; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java similarity index 88% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java index 353928640b..ebc602034b 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java @@ -18,8 +18,8 @@ package org.keycloak.admin.client.spi; import javax.net.ssl.SSLContext; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.client.WebTarget; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.WebTarget; /** * An SPI for using the JAX-RS Client API regardless of the underlying stack. @@ -29,7 +29,7 @@ public interface ResteasyClientProvider { /** * Creates a new {@link Client}. * - * @param messageHandler a {@link jakarta.ws.rs.ext.MessageBodyReader} and/or {@link jakarta.ws.rs.ext.MessageBodyWriter} instance. + * @param messageHandler a {@link javax.ws.rs.ext.MessageBodyReader} and/or {@link javax.ws.rs.ext.MessageBodyWriter} instance. * @param sslContext an optional {@link SSLContext} * @param disableTrustManager if the client should not validate the server certificates when using TLS * @return diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/token/TokenManager.java similarity index 97% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/token/TokenManager.java index b01c6d000b..38c8547034 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/token/TokenManager.java @@ -17,7 +17,7 @@ package org.keycloak.admin.client.token; -import jakarta.ws.rs.client.WebTarget; +import javax.ws.rs.client.WebTarget; import org.jboss.resteasy.client.jaxrs.ResteasyClient; import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; import org.keycloak.admin.client.Config; @@ -26,9 +26,9 @@ import org.keycloak.admin.client.resource.BasicAuthFilter; import org.keycloak.common.util.Time; import org.keycloak.representations.AccessTokenResponse; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.core.Form; +import javax.ws.rs.BadRequestException; +import javax.ws.rs.client.Client; +import javax.ws.rs.core.Form; import static org.keycloak.OAuth2Constants.CLIENT_CREDENTIALS; import static org.keycloak.OAuth2Constants.CLIENT_ID; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/token/TokenService.java similarity index 86% rename from integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java rename to integration/admin-client-jee/src/main/java/org/keycloak/admin/client/token/TokenService.java index c2f2010b75..91a921fc87 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java +++ b/integration/admin-client-jee/src/main/java/org/keycloak/admin/client/token/TokenService.java @@ -19,13 +19,13 @@ package org.keycloak.admin.client.token; import org.keycloak.representations.AccessTokenResponse; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; +import javax.ws.rs.Consumes; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedMap; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client/pom.xml b/integration/admin-client/pom.xml index 8110744e7b..b1b9a79cfa 100755 --- a/integration/admin-client/pom.xml +++ b/integration/admin-client/pom.xml @@ -30,6 +30,13 @@ Keycloak Admin REST Client + + -Dnone + + ${project.basedir}/../admin-client-jee/src + ${project.basedir}/src + + org.keycloak @@ -73,4 +80,77 @@ + + + + maven-antrun-plugin + 3.0.0 + + + transform + initialize + + run + + + + + + + + + + + + + + + + + + + + + + org.eclipse.transformer + org.eclipse.transformer.cli + 0.2.0 + + + ant-contrib + ant-contrib + 1.0b3 + + + ant + ant + + + + + + + + + + + jdk17+ + + [17,) + + + + -Djava.security.manager=allow + + + + diff --git a/integration/pom.xml b/integration/pom.xml index 29990b5f91..dc6dde5da4 100755 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -31,8 +31,8 @@ pom + admin-client-jee admin-client - admin-client-jakarta client-registration client-cli diff --git a/pom.xml b/pom.xml index 6df7a370b9..7a130b2f37 100644 --- a/pom.xml +++ b/pom.xml @@ -1249,12 +1249,12 @@ org.keycloak - keycloak-admin-client + keycloak-admin-client-jee ${project.version} org.keycloak - keycloak-admin-client-jakarta + keycloak-admin-client ${project.version} diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml index 653fbb5b65..0d7b0ab66e 100644 --- a/testsuite/integration-arquillian/tests/pom.xml +++ b/testsuite/integration-arquillian/tests/pom.xml @@ -1767,7 +1767,7 @@ org.keycloak - keycloak-admin-client-jakarta + keycloak-admin-client org.keycloak diff --git a/testsuite/utils/pom.xml b/testsuite/utils/pom.xml index a47a1dfa3c..fb263fd15a 100755 --- a/testsuite/utils/pom.xml +++ b/testsuite/utils/pom.xml @@ -62,7 +62,7 @@ org.keycloak - keycloak-admin-client-jakarta + keycloak-admin-client org.keycloak