From 79a9006a09914f4fa11b71f6f15f9b9aa0a5c42e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 20 Mar 2013 11:23:47 +0000
Subject: [PATCH] OPENDJ-808 Implement a simple commons REST based HTTP connection handler
---
opendj-sdk/opends/ivy.xml | 13 ++++++++-----
opendj-sdk/opends/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java | 18 ++++++++----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/opendj-sdk/opends/ivy.xml b/opendj-sdk/opends/ivy.xml
index c214f0c..cc4fad9 100644
--- a/opendj-sdk/opends/ivy.xml
+++ b/opendj-sdk/opends/ivy.xml
@@ -26,23 +26,26 @@
! Copyright 2013 ForgeRock AS
! -->
<!DOCTYPE ivy-module [
- <!ENTITY grizzly.version "2.3-rc6">
+ <!ENTITY grizzly.version "2.2.19">
]>
<ivy-module version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd">
<info organisation="org.forgerock" module="opendj"/>
<dependencies>
- <dependency org="javax.mail" name="mail" rev="1.4.1" />
+ <dependency org="javax.mail" name="mail" rev="1.4.5" />
<dependency org="com.sleepycat" name="je" rev="5.0.48" />
<!--dependency org="org.forgerock.opendj" name="opendj-rest2ldap-servlet" rev="3.0.0-SNAPSHOT" /-->
<dependency org="org.glassfish.grizzly" name="grizzly-http-servlet" rev="&grizzly.version;" />
<dependency org="org.glassfish.grizzly" name="grizzly-project" rev="&grizzly.version;" />
+ <dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1" />
- <!-- Force download of the sources jar -->
- <!--
+ <!-- Force download of the sources jar -->
+ <!--
<dependency org="org.glassfish.grizzly" name="grizzly-http-server" rev="&grizzly.version;" conf="default->master,sources"/>
<dependency org="org.glassfish.grizzly" name="grizzly-framework" rev="&grizzly.version;" conf="default->master,sources"/>
- -->
+ -->
+
+ <exclude org="javax.activation" artifact="activation" />
</dependencies>
</ivy-module>
diff --git a/opendj-sdk/opends/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java b/opendj-sdk/opends/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
index 892b866..4a072d0 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java
@@ -43,12 +43,10 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
import javax.net.ssl.KeyManager;
import javax.net.ssl.SSLContext;
import javax.net.ssl.SSLEngine;
-import javax.servlet.DispatcherType;
import javax.servlet.Filter;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -57,8 +55,8 @@
import org.glassfish.grizzly.http.server.HttpServer;
import org.glassfish.grizzly.http.server.NetworkListener;
-import org.glassfish.grizzly.http.server.ServerConfiguration;
import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
+import org.glassfish.grizzly.servlet.DispatcherType;
import org.glassfish.grizzly.servlet.FilterRegistration;
import org.glassfish.grizzly.servlet.ServletRegistration;
import org.glassfish.grizzly.servlet.WebappContext;
@@ -692,11 +690,11 @@
this.httpServer =
HttpServer.createSimpleServer("./", initConfig.getListenPort());
- int requestSize = (int) currentConfig.getMaxRequestSize();
- final ServerConfiguration serverConfig =
- this.httpServer.getServerConfiguration();
- serverConfig.setMaxBufferedPostSize(requestSize);
- serverConfig.setMaxFormPostSize(requestSize);
+ // int requestSize = (int) currentConfig.getMaxRequestSize();
+ // final ServerConfiguration serverConfig =
+ // this.httpServer.getServerConfiguration();
+ // serverConfig.setMaxBufferedPostSize(requestSize);
+ // serverConfig.setMaxFormPostSize(requestSize);
try
{
@@ -706,8 +704,8 @@
transport.setReuseAddress(currentConfig.isAllowTCPReuseAddress());
transport.setKeepAlive(currentConfig.isUseTCPKeepAlive());
transport.setTcpNoDelay(currentConfig.isUseTCPNoDelay());
- transport.setWriteTimeout(currentConfig.getMaxBlockedWriteTimeLimit(),
- TimeUnit.MILLISECONDS);
+ // transport.setWriteTimeout(currentConfig
+ // .getMaxBlockedWriteTimeLimit(), TimeUnit.MILLISECONDS);
int bufferSize = (int) currentConfig.getBufferSize();
transport.setReadBufferSize(bufferSize);
--
Gitblit v1.10.0