You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by de...@apache.org on 2007/03/30 08:35:42 UTC
svn commit: r523958 - in /webservices/axis2/branches/java/1_2: etc/
modules/kernel/src/org/apache/axis2/transport/http/server/ modules/parent/
Author: deepal
Date: Thu Mar 29 23:35:41 2007
New Revision: 523958
URL: http://svn.apache.org/viewvc?view=rev&rev=523958
Log:
applied the patch in 2411
- Http core update
(didnt commit to trunk)
Modified:
webservices/axis2/branches/java/1_2/etc/project.properties
webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java
webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/HttpFactory.java
webservices/axis2/branches/java/1_2/modules/parent/pom.xml
Modified: webservices/axis2/branches/java/1_2/etc/project.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/etc/project.properties?view=diff&rev=523958&r1=523957&r2=523958
==============================================================================
--- webservices/axis2/branches/java/1_2/etc/project.properties (original)
+++ webservices/axis2/branches/java/1_2/etc/project.properties Thu Mar 29 23:35:41 2007
@@ -113,7 +113,7 @@
fastinfoset.version=1.2.1
geronimo.spec.jms.version=1.1-rc4
groovy.all.version=1.0-jsr-06
-jakarta.httpcore.version=4.0-alpha3
+jakarta.httpcore.version=4.0-alpha4
javamail.version=1.4
jaxbri.version=2.0.2
jaxen.version=1.1-beta-10
Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java?view=diff&rev=523958&r1=523957&r2=523958
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java (original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/AxisHttpService.java Thu Mar 29 23:35:41 2007
@@ -73,7 +73,6 @@
private final MessageContext msgContext;
private final ConfigurationContext configurationContext;
- private final SessionManager sessionManager;
private final Worker worker;
public AxisHttpService(
@@ -81,7 +80,6 @@
final ConnectionReuseStrategy connStrategy,
final HttpResponseFactory responseFactory,
final ConfigurationContext configurationContext,
- final SessionManager sessionManager,
final Worker worker) {
super(httpProcessor, connStrategy, responseFactory);
if (worker == null) {
@@ -90,11 +88,7 @@
if (configurationContext == null) {
throw new IllegalArgumentException("Configuration context may not be null");
}
- if (sessionManager == null) {
- throw new IllegalArgumentException("Session manager may not be null");
- }
this.configurationContext = configurationContext;
- this.sessionManager = sessionManager;
this.worker = worker;
this.msgContext = ContextFactory.createMessageContext(configurationContext);
Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java?view=diff&rev=523958&r1=523957&r2=523958
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java (original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/DefaultHttpConnectionManager.java Thu Mar 29 23:35:41 2007
@@ -59,7 +59,6 @@
private final WorkerFactory workerfactory;
private final HttpParams params;
private final List processors;
- private final SessionManager sessionManager;
private HttpFactory httpFactory = null;
@@ -82,7 +81,6 @@
throw new IllegalArgumentException("HTTP parameters may not be null");
}
this.configurationContext = configurationContext;
- this.sessionManager = new SessionManager();
this.executor = executor;
this.workerfactory = workerfactory;
this.params = params;
@@ -157,7 +155,6 @@
connStrategy,
responseFactory,
this.configurationContext,
- this.sessionManager,
this.workerfactory.newWorker());
httpService.setParams(this.params);
Modified: webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/HttpFactory.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/HttpFactory.java?view=diff&rev=523958&r1=523957&r2=523958
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/HttpFactory.java (original)
+++ webservices/axis2/branches/java/1_2/modules/kernel/src/org/apache/axis2/transport/http/server/HttpFactory.java Thu Mar 29 23:35:41 2007
@@ -44,8 +44,8 @@
import org.apache.http.ConnectionReuseStrategy;
import org.apache.http.HttpResponseFactory;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
-import org.apache.http.impl.DefaultHttpParams;
import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
@@ -261,7 +261,7 @@
* Create and set the parameters applied to incoming request connections
*/
public HttpParams newRequestConnectionParams() {
- HttpParams params = new DefaultHttpParams();
+ HttpParams params = new BasicHttpParams();
params
.setIntParameter(HttpConnectionParams.SO_TIMEOUT, requestSocketTimeout)
.setBooleanParameter(HttpConnectionParams.TCP_NODELAY, requestTcpNoDelay)
Modified: webservices/axis2/branches/java/1_2/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_2/modules/parent/pom.xml?view=diff&rev=523958&r1=523957&r2=523958
==============================================================================
--- webservices/axis2/branches/java/1_2/modules/parent/pom.xml (original)
+++ webservices/axis2/branches/java/1_2/modules/parent/pom.xml Thu Mar 29 23:35:41 2007
@@ -101,7 +101,7 @@
<commons.logging.version>1.1</commons.logging.version>
<geronimo.spec.jms.version>1.1-rc4</geronimo.spec.jms.version>
<groovy.all.version>1.0-jsr-06</groovy.all.version>
- <jakarta.httpcore.version>4.0-alpha3</jakarta.httpcore.version>
+ <jakarta.httpcore.version>4.0-alpha4</jakarta.httpcore.version>
<javamail.version>1.4</javamail.version>
<jaxbri.version>2.0.2</jaxbri.version>
<jaxen.version>1.1-beta-10</jaxen.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org