patch restlet to avoid shading

maximthomas · Jan 22, 2025 · 21cb1e5 · 21cb1e5
1 parent 621ea65
commit 21cb1e5
Show file tree

Hide file tree

Showing 40 changed files with 2,140 additions and 52 deletions.
diff --git a/openam-audit/openam-audit-configuration/pom.xml b/openam-audit/openam-audit-configuration/pom.xml
@@ -79,12 +79,12 @@
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.openidentityplatform.openam.shaded</groupId>-->
-<!--            <artifactId>activemq-client</artifactId>-->
-<!--            <scope>test</scope>-->
-<!--            <classifier>jakarta</classifier>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.openidentityplatform.openam.shaded</groupId>
+            <artifactId>activemq-client</artifactId>
+            <scope>test</scope>
+            <classifier>jakarta</classifier>
+        </dependency>
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

diff --git a/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/rest/XacmlService.java b/openam-entitlements/src/main/java/org/forgerock/openam/xacml/v3/rest/XacmlService.java
@@ -47,7 +47,7 @@
 import org.restlet.Request;
 import org.restlet.data.Disposition;
 import org.restlet.data.Status;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 import org.restlet.representation.OutputRepresentation;
 import org.restlet.representation.Representation;
 import org.restlet.resource.Get;

diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ClientAuthenticator.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ClientAuthenticator.java
@@ -42,7 +42,7 @@
 import org.forgerock.util.Reject;
 import org.restlet.Request;
 import org.restlet.Response;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 
 import com.sun.identity.authentication.AuthContext;
 import com.sun.identity.authentication.spi.AuthLoginException;

diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2Request.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2Request.java
@@ -38,7 +38,7 @@
 import org.restlet.data.MediaType;
 import org.restlet.data.Method;
 import org.restlet.ext.jackson.JacksonRepresentation;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2RequestFactory.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/OAuth2RequestFactory.java
@@ -27,7 +27,7 @@
 import org.forgerock.openam.rest.representations.JacksonRepresentationFactory;
 import org.forgerock.openam.utils.StringUtils;
 import org.restlet.Request;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 
 import com.sun.identity.shared.debug.Debug;
 

diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResourceOwnerAuthenticator.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResourceOwnerAuthenticator.java
@@ -47,7 +47,7 @@
 import org.restlet.Request;
 import org.restlet.Response;
 import org.restlet.data.Status;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 import org.restlet.resource.ResourceException;
 
 /**

diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResourceOwnerSessionValidator.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/core/ResourceOwnerSessionValidator.java
@@ -95,7 +95,7 @@
 import org.restlet.data.Form;
 import org.restlet.data.Parameter;
 import org.restlet.data.Reference;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 
 /**
  * Validates whether a resource owner has a current authenticated session.

diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ConsentRequiredResource.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ConsentRequiredResource.java
@@ -13,6 +13,7 @@
  *
  * Copyright 2015-2016 ForgeRock AS.
  * Portions Copyrighted 2019 Open Source Solution Technology Corp.
+ * Portions copyright 2025 3A Systems LLC.
  */
 package org.forgerock.oauth2.restlet;
 
@@ -37,7 +38,7 @@
 import org.restlet.data.Language;
 import org.restlet.data.Preference;
 import org.restlet.data.Reference;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 import org.restlet.routing.Router;
 
 import com.iplanet.sso.SSOToken;

diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/DeviceCodeResource.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/DeviceCodeResource.java
@@ -42,7 +42,7 @@
 import org.forgerock.openam.services.baseurl.BaseURLProviderFactory;
 import org.forgerock.openam.utils.StringUtils;
 import org.restlet.Request;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 import org.restlet.representation.Representation;
 import org.restlet.resource.Post;
 import org.restlet.resource.ServerResource;

diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/DeviceCodeVerificationResource.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/DeviceCodeVerificationResource.java
@@ -64,7 +64,7 @@
 import org.restlet.data.Language;
 import org.restlet.data.Preference;
 import org.restlet.ext.freemarker.TemplateRepresentation;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 import org.restlet.representation.Representation;
 import org.restlet.resource.Get;
 import org.restlet.resource.Post;

diff --git a/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ExceptionHandler.java b/openam-oauth2/src/main/java/org/forgerock/oauth2/restlet/ExceptionHandler.java
@@ -28,7 +28,7 @@
 import org.restlet.Response;
 import org.restlet.data.Reference;
 import org.restlet.data.Status;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 import org.restlet.routing.Redirector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/OAuth2UrisFactory.java b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/OAuth2UrisFactory.java
@@ -36,7 +36,7 @@
 import org.forgerock.openam.services.baseurl.InvalidBaseUrlException;
 import org.forgerock.services.context.Context;
 import org.restlet.Request;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 
 /**
  * A factory for creating/retrieving OAuth2Uris instances.

diff --git a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/OAuth2Utils.java b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/OAuth2Utils.java
@@ -43,7 +43,7 @@
 import org.restlet.data.Method;
 import org.restlet.data.Reference;
 import org.restlet.ext.jackson.JacksonRepresentation;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 import org.restlet.representation.EmptyRepresentation;
 import org.restlet.resource.ResourceException;
 import org.restlet.routing.Redirector;

diff --git a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/OpenAMScopeValidator.java b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/OpenAMScopeValidator.java
@@ -74,7 +74,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.restlet.Request;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 
 import com.iplanet.am.sdk.AMHashMap;
 import com.iplanet.am.util.SystemProperties;

diff --git a/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/StatefulTokenStore.java b/openam-oauth2/src/main/java/org/forgerock/openam/oauth2/StatefulTokenStore.java
@@ -87,7 +87,7 @@
 import org.json.JSONObject;
 import org.restlet.Request;
 import org.restlet.data.Status;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 
 /**
  * Implementation of the OpenId Connect Token Store which the OpenId Connect Provider will implement.

diff --git a/...oauth2/src/main/java/org/forgerock/openam/rest/audit/OAuth2AbstractAccessAuditFilter.java b/...oauth2/src/main/java/org/forgerock/openam/rest/audit/OAuth2AbstractAccessAuditFilter.java
@@ -37,7 +37,7 @@
 import org.restlet.Request;
 import org.restlet.Response;
 import org.restlet.Restlet;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/openam-oauth2/src/main/java/org/forgerock/openidconnect/IdTokenResponseTypeHandler.java b/openam-oauth2/src/main/java/org/forgerock/openidconnect/IdTokenResponseTypeHandler.java
@@ -35,7 +35,7 @@
 import org.forgerock.oauth2.core.exceptions.ServerException;
 import org.forgerock.openam.utils.OpenAMSettings;
 import org.restlet.Request;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 
 /**
  * Implementation of the ResponseTypeHandler for handling OpenId Connect token response types.

diff --git a/openam-oauth2/src/main/java/org/forgerock/openidconnect/restlet/IdTokenInfo.java b/openam-oauth2/src/main/java/org/forgerock/openidconnect/restlet/IdTokenInfo.java
@@ -54,7 +54,7 @@
 import org.forgerock.util.annotations.VisibleForTesting;
 import org.restlet.Request;
 import org.restlet.ext.json.JsonRepresentation;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 import org.restlet.representation.Representation;
 import org.restlet.resource.Post;
 import org.restlet.resource.ServerResource;

diff --git a/.../src/main/java/org/forgerock/openidconnect/restlet/OpenIDConnectCheckSessionEndpoint.java b/.../src/main/java/org/forgerock/openidconnect/restlet/OpenIDConnectCheckSessionEndpoint.java
@@ -11,9 +11,8 @@
 import org.forgerock.oauth2.restlet.OAuth2RestletException;
 import org.forgerock.openam.services.baseurl.BaseURLProviderFactory;
 import org.forgerock.openidconnect.CheckSession;
-import org.forgerock.openidconnect.restlet.OpenIDConnectCheckSessionEndpoint;
 import org.restlet.Context;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 import org.restlet.representation.Representation;
 import org.restlet.resource.Get;
 import org.restlet.resource.Post;

diff --git a/openam-oauth2/src/main/java/org/forgerock/openidconnect/restlet/OpenIDConnectDiscovery.java b/openam-oauth2/src/main/java/org/forgerock/openidconnect/restlet/OpenIDConnectDiscovery.java
@@ -28,7 +28,7 @@
 import org.forgerock.openidconnect.OpenIDConnectProviderDiscovery;
 import org.restlet.Request;
 import org.restlet.ext.json.JsonRepresentation;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 import org.restlet.representation.Representation;
 import org.restlet.resource.Get;
 import org.restlet.resource.ServerResource;

diff --git a/openam-oauth2/src/test/java/org/forgerock/oauth2/core/OAuth2RequestFactoryTest.java b/openam-oauth2/src/test/java/org/forgerock/oauth2/core/OAuth2RequestFactoryTest.java
@@ -29,7 +29,7 @@
 import org.forgerock.openam.rest.representations.JacksonRepresentationFactory;
 import org.mockito.ArgumentCaptor;
 import org.restlet.engine.adapter.HttpRequest;
-import org.restlet.ext.servlet.internal.ServletCall;
+import org.forgerock.openam.rest.jakarta.servlet.internal.ServletCall;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

diff --git a/openam-rest/pom.xml b/openam-rest/pom.xml
@@ -44,11 +44,6 @@
             <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.openidentityplatform.openam.shaded</groupId>
-            <artifactId>restlet</artifactId>
-            <classifier>jakarta</classifier>
-        </dependency>
 
         <dependency>
             <groupId>org.openidentityplatform.openam</groupId>

diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/RealmRoutingFactory.java b/openam-rest/src/main/java/org/forgerock/openam/rest/RealmRoutingFactory.java
@@ -54,7 +54,7 @@
 import org.forgerock.util.promise.Promise;
 import org.forgerock.util.promise.Promises;
 import org.restlet.Restlet;
-import org.restlet.ext.servlet.ServletUtils;
+import org.forgerock.openam.rest.jakarta.servlet.ServletUtils;
 import org.restlet.routing.TemplateRoute;
 
 /**

diff --git a/...-rest/src/main/java/org/forgerock/openam/rest/audit/AbstractRestletAccessAuditFilter.java b/...-rest/src/main/java/org/forgerock/openam/rest/audit/AbstractRestletAccessAuditFilter.java
@@ -25,7 +25,7 @@
 import static org.forgerock.openam.rest.service.RestletRealmRouter.REALM;
 import static org.forgerock.openam.utils.StringUtils.isBlank;
 import static org.forgerock.openam.utils.Time.*;
-import static org.restlet.ext.servlet.ServletUtils.getRequest;
+import static org.forgerock.openam.rest.jakarta.servlet.ServletUtils.getRequest;
 
 import java.util.Set;
 

diff --git a/openam-rest/src/main/java/org/forgerock/openam/rest/service/RestletServiceServlet.java b/openam-rest/src/main/java/org/forgerock/openam/rest/service/RestletServiceServlet.java
@@ -17,7 +17,7 @@
 
 package org.forgerock.openam.rest.service;
 
-import org.restlet.ext.servlet.ServerServlet;
+import org.forgerock.openam.rest.jakarta.servlet.ServerServlet;
 
 import jakarta.servlet.ServletConfig;
 import jakarta.servlet.ServletContext;

diff --git a/openam-restlet/pom.xml b/openam-restlet/pom.xml
@@ -31,18 +31,43 @@
     <artifactId>openam-restlet</artifactId>
     <packaging>jar</packaging>
 
+    <repositories>
+        <repository>
+            <id>maven-restlet</id>
+            <url>https://maven.restlet.talend.com</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <!-- Java EE -->
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.restlet.jee</groupId>
+            <artifactId>org.restlet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.restlet.jee</groupId>
+            <artifactId>org.restlet.ext.json</artifactId>
+        </dependency>
         <dependency>
-            <groupId>org.openidentityplatform.openam.shaded</groupId>
-            <artifactId>restlet</artifactId>
-            <classifier>jakarta</classifier>
+            <groupId>org.restlet.jee</groupId>
+            <artifactId>org.restlet.ext.xml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.restlet.jee</groupId>
+            <artifactId>org.restlet.ext.servlet</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.restlet.jee</groupId>
+            <artifactId>org.restlet.ext.jackson</artifactId>
+        </dependency>
+
 
         <!-- OpenAM Shared -->
         <dependency>