From 1fafe95ccd49ca4498e4ba0cb8963126de7b69a3 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 18 Sep 2015 22:56:24 +0000
Subject: [PATCH] CHF-69: move Context and AbstractRouter to org.forgerock.services
---
opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/RequestState.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/RequestState.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/RequestState.java
index 825736a..5adcc5a 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/RequestState.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/RequestState.java
@@ -21,10 +21,8 @@
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.CountDownLatch;
-import org.forgerock.http.Context;
import org.forgerock.json.resource.InternalServerErrorException;
import org.forgerock.json.resource.ResourceException;
-import org.forgerock.json.resource.SecurityContext;
import org.forgerock.opendj.ldap.AbstractAsynchronousConnection;
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.ConnectionEventListener;
@@ -54,6 +52,8 @@
import org.forgerock.opendj.ldap.responses.Result;
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
import org.forgerock.opendj.ldap.responses.SearchResultReference;
+import org.forgerock.services.context.Context;
+import org.forgerock.services.context.SecurityContext;
import org.forgerock.util.promise.ExceptionHandler;
import org.forgerock.util.promise.Promise;
import org.forgerock.util.promise.PromiseImpl;
@@ -238,7 +238,7 @@
try {
final SecurityContext securityContext = context.asContext(SecurityContext.class);
final String authzId = config.getProxiedAuthorizationTemplate().formatAsAuthzId(
- securityContext.getAuthorizationId(), config.schema());
+ securityContext.getAuthorization(), config.schema());
proxiedAuthzControl = ProxiedAuthV2RequestControl.newControl(authzId);
} catch (final ResourceException e) {
return Promises.newExceptionPromise(e);
--
Gitblit v1.10.0