mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
parent: 317f7552 | patch | commit | ignore whitespace
Gaetan Boismal
09.51.2016 e549068fcab633594251d2363e40087a5913963f 
OPENDJ-3129 Consequences of OPENIG-1061

To avoid circular dependencies issue in openig, there is a new openig-toolkit project.
All the code that we need for rest2ldap has been migrated to this module.
The source code has not been changed though, only packages names update in rest2ldap source code.
See OPENIG-1061 for more details about the openig-toolkit module.
16 files modified
82 ■■■■■ changed files
opendj-rest2ldap/pom.xml 6 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java 10 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorizations.java 10 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/CtsAccessTokenResolver.java 6 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/FileAccessTokenResolver.java 6 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessTokenResolver.java 6 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Utils.java 2 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/AuthorizationsTestCase.java 6 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/OAuth2JsonConfigurationTestCase.java 2 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/CtsAccessTokenResolverTestCase.java 4 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessResolverTestCase.java 6 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2AuthorizationMechanism.java 8 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2CtsAuthorizationMechanism.java 2 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2FileAuthorizationMechanism.java 2 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2OpenAmAuthorizationMechanism.java 4 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2TokenIntrospectionAuthorizationMechanism.java 2 ●●●●● patch | view | raw | blame | history 
 opendj-rest2ldap/pom.xml


@@ -34,7 +34,7 @@


            org.forgerock.opendj.*;provide:=true,


            org.forgerock.json.*;provide:=true


        </opendj.osgi.import.additional>


        <openig.version>5.0.0-SNAPSHOT</openig.version>


        <openig.toolkit.version>4.5.0-SNAPSHOT</openig.toolkit.version>


    </properties>






@@ -66,8 +66,8 @@




        <dependency>


            <groupId>org.forgerock.openig</groupId>


            <artifactId>openig-oauth2-resource-server-filter</artifactId>


            <version>${openig.version}</version>


            <artifactId>openig-toolkit</artifactId>


            <version>${openig.toolkit.version}</version>


        </dependency>




        <dependency>




 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAPHttpApplication.java


@@ -46,11 +46,11 @@


import java.util.concurrent.Executors;


import java.util.concurrent.ScheduledExecutorService;




import org.forgerock.authz.modules.oauth2.AccessTokenInfo;


import org.forgerock.authz.modules.oauth2.AccessTokenException;


import org.forgerock.authz.modules.oauth2.AccessTokenResolver;


import org.forgerock.authz.modules.oauth2.cache.CachingAccessTokenResolver;


import org.forgerock.authz.modules.oauth2.resolver.OpenAmAccessTokenResolver;


import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.resolver.CachingAccessTokenResolver;


import org.forgerock.openig.oauth2.resolver.OpenAmAccessTokenResolver;


import org.forgerock.http.Filter;


import org.forgerock.http.Handler;


import org.forgerock.http.HttpApplication;




 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Authorizations.java


@@ -24,11 +24,11 @@


import java.util.Map;


import java.util.Set;




import org.forgerock.authz.modules.oauth2.AccessTokenInfo;


import org.forgerock.authz.modules.oauth2.AccessTokenResolver;


import org.forgerock.authz.modules.oauth2.OAuth2Context;


import org.forgerock.authz.modules.oauth2.ResourceAccess;


import org.forgerock.authz.modules.oauth2.ResourceServerFilter;


import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.OAuth2Context;


import org.forgerock.openig.oauth2.ResourceAccess;


import org.forgerock.openig.oauth2.ResourceServerFilter;


import org.forgerock.http.Filter;


import org.forgerock.http.Handler;


import org.forgerock.http.filter.Filters;




 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/CtsAccessTokenResolver.java


@@ -24,9 +24,9 @@


import java.io.IOException;


import java.util.concurrent.atomic.AtomicReference;




import org.forgerock.authz.modules.oauth2.AccessTokenInfo;


import org.forgerock.authz.modules.oauth2.AccessTokenException;


import org.forgerock.authz.modules.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.util.Json;


import org.forgerock.json.JsonValue;


import org.forgerock.opendj.ldap.Connection;




 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/FileAccessTokenResolver.java


@@ -26,9 +26,9 @@


import java.io.IOException;


import java.io.InputStream;




import org.forgerock.authz.modules.oauth2.AccessTokenInfo;


import org.forgerock.authz.modules.oauth2.AccessTokenException;


import org.forgerock.authz.modules.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.util.Json;


import org.forgerock.json.JsonValue;


import org.forgerock.json.JsonValueException;




 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessTokenResolver.java


@@ -26,9 +26,9 @@


import java.util.HashSet;


import java.util.Set;




import org.forgerock.authz.modules.oauth2.AccessTokenInfo;


import org.forgerock.authz.modules.oauth2.AccessTokenException;


import org.forgerock.authz.modules.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.Handler;


import org.forgerock.http.protocol.Responses;


import org.forgerock.http.protocol.Entity;




 opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/authz/Utils.java


@@ -21,7 +21,7 @@


import java.io.Closeable;


import java.util.concurrent.atomic.AtomicReference;




import org.forgerock.authz.modules.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.http.protocol.Response;


import org.forgerock.http.protocol.Status;


import org.forgerock.i18n.LocalizableMessage;




 opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/AuthorizationsTestCase.java


@@ -27,9 +27,9 @@


import java.util.Map;


import java.util.Set;




import org.forgerock.authz.modules.oauth2.AccessTokenInfo;


import org.forgerock.authz.modules.oauth2.AccessTokenException;


import org.forgerock.authz.modules.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.Handler;


import org.forgerock.http.protocol.Request;


import org.forgerock.json.JsonValue;




 opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/OAuth2JsonConfigurationTestCase.java


@@ -22,7 +22,7 @@


import static org.mockito.Mockito.spy;


import static org.mockito.Mockito.when;




import org.forgerock.authz.modules.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.json.JsonValueException;


import org.forgerock.opendj.ldap.ConnectionFactory;


import org.forgerock.testng.ForgeRockTestCase;




 opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/CtsAccessTokenResolverTestCase.java


@@ -26,8 +26,8 @@




import java.util.concurrent.ExecutionException;




import org.forgerock.authz.modules.oauth2.AccessTokenInfo;


import org.forgerock.authz.modules.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.json.JsonPointer;


import org.forgerock.opendj.ldap.Attribute;


import org.forgerock.opendj.ldap.Connection;




 opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/authz/Rfc7662AccessResolverTestCase.java


@@ -27,9 +27,9 @@


import java.util.Map;


import java.util.concurrent.ExecutionException;




import org.forgerock.authz.modules.oauth2.AccessTokenInfo;


import org.forgerock.authz.modules.oauth2.AccessTokenException;


import org.forgerock.authz.modules.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.Handler;


import org.forgerock.http.MutableUri;


import org.forgerock.http.protocol.Request;




 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2AuthorizationMechanism.java


@@ -33,10 +33,10 @@


import java.util.concurrent.ScheduledExecutorService;


import java.util.concurrent.TimeUnit;




import org.forgerock.authz.modules.oauth2.AccessTokenException;


import org.forgerock.authz.modules.oauth2.AccessTokenInfo;


import org.forgerock.authz.modules.oauth2.AccessTokenResolver;


import org.forgerock.authz.modules.oauth2.cache.CachingAccessTokenResolver;


import org.forgerock.openig.oauth2.AccessTokenException;


import org.forgerock.openig.oauth2.AccessTokenInfo;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.resolver.CachingAccessTokenResolver;


import org.forgerock.json.JsonException;


import org.forgerock.json.JsonPointer;


import org.forgerock.opendj.config.server.ConfigException;




 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2CtsAuthorizationMechanism.java


@@ -19,7 +19,7 @@


import static org.forgerock.opendj.rest2ldap.authz.Authorizations.newCtsAccessTokenResolver;


import static org.opends.messages.ConfigMessages.ERR_CONFIG_AUTHZ_REFERENCED_DN_DOESNT_EXISTS;




import org.forgerock.authz.modules.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.opendj.config.server.ConfigException;


import org.forgerock.opendj.ldap.DN;


import org.forgerock.opendj.server.config.server.HTTPOauth2CtsAuthorizationMechanismCfg;




 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2FileAuthorizationMechanism.java


@@ -22,7 +22,7 @@


import java.nio.file.Files;


import java.nio.file.Paths;




import org.forgerock.authz.modules.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.opendj.config.server.ConfigException;


import org.forgerock.opendj.server.config.server.HTTPOauth2FileAuthorizationMechanismCfg;


import org.opends.server.core.ServerContext;




 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2OpenAmAuthorizationMechanism.java


@@ -21,8 +21,8 @@


import java.net.URI;


import java.net.URISyntaxException;




import org.forgerock.authz.modules.oauth2.AccessTokenResolver;


import org.forgerock.authz.modules.oauth2.resolver.OpenAmAccessTokenResolver;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.resolver.OpenAmAccessTokenResolver;


import org.forgerock.http.HttpApplicationException;


import org.forgerock.http.handler.HttpClientHandler;


import org.forgerock.opendj.config.server.ConfigException;




 opendj-server-legacy/src/main/java/org/opends/server/protocols/http/authz/HttpOAuth2TokenIntrospectionAuthorizationMechanism.java


@@ -22,7 +22,7 @@


import java.net.URI;


import java.net.URISyntaxException;




import org.forgerock.authz.modules.oauth2.AccessTokenResolver;


import org.forgerock.openig.oauth2.AccessTokenResolver;


import org.forgerock.http.HttpApplicationException;


import org.forgerock.http.handler.HttpClientHandler;


import org.forgerock.opendj.config.server.ConfigException;