From 987db5d2d3c1311b3ae7ea46c36d61e2ed9ba5e9 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 07 Feb 2014 10:37:16 +0000
Subject: [PATCH] * Replace dependency on opendj-server2x-adapter by dependency on opendj-server3x-adapter
---
opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java | 2 +-
opendj3-server-dev/ivy.xml | 4 ++--
opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java | 2 +-
opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java | 2 +-
opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 44 ++++++++++++++++++++++----------------------
5 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/opendj3-server-dev/ivy.xml b/opendj3-server-dev/ivy.xml
index 6a8dfdd..5db51ed 100644
--- a/opendj3-server-dev/ivy.xml
+++ b/opendj3-server-dev/ivy.xml
@@ -53,8 +53,8 @@
<dependency org="org.forgerock.opendj" name="opendj-rest2ldap-servlet" rev="&opendj.sdk.version;" conf="default->master,compile" />
<dependency org="org.forgerock.opendj" name="opendj-slf4j-adapter" rev="&opendj.sdk.version;" />
<dependency org="org.forgerock.commons" name="i18n-slf4j" rev="&i18n.version;" />
- <dependency org="org.forgerock.opendj" name="opendj-cli" rev="&opendj.sdk.version;" />
- <dependency org="org.forgerock.opendj" name="opendj-server2x-adapter" rev="&opendj.sdk.version;">
+ <dependency org="org.forgerock.opendj" name="opendj-cli" rev="&opendj.sdk.version;" />
+ <dependency org="org.forgerock.opendj" name="opendj-server3x-adapter" rev="&opendj.sdk.version;">
<exclude module="opendj-server" />
</dependency>
<dependency org="org.forgerock.opendj" name="opendj-server" rev="&opendj.sdk.version;">
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
index 15bed18..e3e8e4b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/http/CollectClientConnectionsFilter.java
@@ -40,7 +40,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.json.resource.ResourceException;
-import org.forgerock.opendj.adapter.server2x.Adapters;
+import org.forgerock.opendj.adapter.server3x.Adapters;
import org.forgerock.opendj.ldap.*;
import org.forgerock.opendj.ldap.Filter;
import org.forgerock.opendj.ldap.requests.BindRequest;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java
index 13bd4d7..5fd3560 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java
@@ -25,7 +25,7 @@
*/
package org.opends.server.protocols.http;
-import static org.forgerock.opendj.adapter.server2x.Converters.*;
+import static org.forgerock.opendj.adapter.server3x.Converters.*;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.AccessLogger.*;
import java.net.InetAddress;
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
index f214de7..e721288 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
@@ -25,7 +25,7 @@
*/
package org.opends.server.protocols.http;
-import static org.forgerock.opendj.adapter.server2x.Converters.*;
+import static org.forgerock.opendj.adapter.server3x.Converters.*;
import static org.forgerock.opendj.ldap.ByteString.*;
import java.util.LinkedHashSet;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index 65b120e..b3f4258 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -327,7 +327,7 @@
LocalizableMessage message =
ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage());
println(message);
- logger.error(LocalizableMessage.raw("Complete error stack:", ae));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), ae);
returnValue = CANNOT_INITIALIZE_ARGS;
}
@@ -354,7 +354,7 @@
println(message);
println();
println(LocalizableMessage.raw(argParser.getUsage()));
- logger.error(LocalizableMessage.raw("Complete error stack:", ae));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), ae);
returnValue = ERROR_USER_DATA;
}
}
@@ -875,7 +875,7 @@
println();
println(getCriticalExceptionMessage(rce));
returnValue = rce.getErrorCode();
- logger.error(LocalizableMessage.raw("Complete error stack:", rce));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), rce);
}
}
else
@@ -1009,7 +1009,7 @@
getServerRepresentation(uData.getHostName(), uData.getPort());
println();
println(getMessageForException(ne, hostPort));
- logger.error(LocalizableMessage.raw("Complete error stack:", ne));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), ne);
}
if (ctx != null)
@@ -1030,7 +1030,7 @@
println();
println(getCriticalExceptionMessage(rce));
returnValue = rce.getErrorCode();
- logger.error(LocalizableMessage.raw("Complete error stack:", rce));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), rce);
}
}
else
@@ -3731,14 +3731,14 @@
}
catch (ADSContextException ace)
{
- logger.error(LocalizableMessage.raw("Complete error stack:", ace));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), ace);
throw new ReplicationCliException(
ERR_REPLICATION_READING_ADS.get(ace.getMessage()),
ERROR_READING_ADS, ace);
}
catch (TopologyCacheException tce)
{
- logger.error(LocalizableMessage.raw("Complete error stack:", tce));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), tce);
throw new ReplicationCliException(
ERR_REPLICATION_READING_ADS.get(tce.getMessage()),
ERROR_READING_TOPOLOGY_CACHE, tce);
@@ -4022,7 +4022,7 @@
String hostPort = getServerRepresentation(host1, port1);
errorMessages.add(getMessageForException(ne, hostPort));
- logger.error(LocalizableMessage.raw("Complete error stack:", ne));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), ne);
}
try
{
@@ -4035,7 +4035,7 @@
String hostPort = getServerRepresentation(host2, port2);
errorMessages.add(getMessageForException(ne, hostPort));
- logger.error(LocalizableMessage.raw("Complete error stack:", ne));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), ne);
}
if (errorMessages.size() > 0)
@@ -4169,7 +4169,7 @@
returnValue = rce.getErrorCode();
println();
println(getCriticalExceptionMessage(rce));
- logger.error(LocalizableMessage.raw("Complete error stack:", rce));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), rce);
}
}
else
@@ -4240,7 +4240,7 @@
getServerRepresentation(uData.getHostName(), uData.getPort());
println();
println(getMessageForException(ne, hostPort));
- logger.error(LocalizableMessage.raw("Complete error stack:", ne));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), ne);
}
if (ctx != null)
@@ -4312,7 +4312,7 @@
returnValue = rce.getErrorCode();
println();
println(getCriticalExceptionMessage(rce));
- logger.error(LocalizableMessage.raw("Complete error stack:", rce));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), rce);
}
}
else
@@ -4355,7 +4355,7 @@
getServerRepresentation(uData.getHostName(), uData.getPort());
println();
println(getMessageForException(ne, hostPort));
- logger.error(LocalizableMessage.raw("Complete error stack:", ne));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), ne);
}
if (ctx != null)
@@ -4370,7 +4370,7 @@
returnValue = rce.getErrorCode();
println();
println(getCriticalExceptionMessage(rce));
- logger.error(LocalizableMessage.raw("Complete error stack:", rce));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), rce);
}
}
else
@@ -4452,7 +4452,7 @@
println();
println(getCriticalExceptionMessage(rce));
returnValue = rce.getErrorCode();
- logger.error(LocalizableMessage.raw("Complete error stack:", rce));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), rce);
}
}
}
@@ -4493,7 +4493,7 @@
final String hostPort = getServerRepresentation(host, port);
println();
println(Utils.getMessageForException(ne, hostPort));
- logger.error(LocalizableMessage.raw("Complete error stack:", ne));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), ne);
}
return context;
}
@@ -4525,7 +4525,7 @@
getServerRepresentation(uData.getHostName(), uData.getPort());
println();
println(getMessageForException(ne, hostPort));
- logger.error(LocalizableMessage.raw("Complete error stack:", ne));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), ne);
}
if (ctx != null)
{
@@ -4567,7 +4567,7 @@
println();
println(getCriticalExceptionMessage(rce));
returnValue = rce.getErrorCode();
- logger.error(LocalizableMessage.raw("Complete error stack:", rce));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), rce);
}
}
}
@@ -4612,7 +4612,7 @@
getServerRepresentation(uData.getHostName(), uData.getPort());
println();
println(getMessageForException(ne, hostPort));
- logger.error(LocalizableMessage.raw("Complete error stack:", ne));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), ne);
}
if (ctx != null)
{
@@ -4654,7 +4654,7 @@
println();
println(getCriticalExceptionMessage(rce));
returnValue = rce.getErrorCode();
- logger.error(LocalizableMessage.raw("Complete error stack:", rce));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), rce);
}
}
printlnProgress();
@@ -4701,7 +4701,7 @@
getServerRepresentation(uData.getHostName(), uData.getPort());
println();
println(getMessageForException(ne, hostPort));
- logger.error(LocalizableMessage.raw("Complete error stack:", ne));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), ne);
}
if (ctx != null)
{
@@ -4743,7 +4743,7 @@
println();
println(getCriticalExceptionMessage(rce));
returnValue = rce.getErrorCode();
- logger.error(LocalizableMessage.raw("Complete error stack:", rce));
+ logger.error(LocalizableMessage.raw("Complete error stack:"), rce);
}
}
printlnProgress();
--
Gitblit v1.10.0