Author: sagara
Date: Sat May 26 05:00:08 2012
New Revision: 1342853
URL: http://svn.apache.org/viewvc?rev=1342853&view=rev
Log:
AXIS2-4318 - Applied latest AXIS2-4318_06.patch, with this it is possible to
run all test cases with HC4.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java
axis/axis2/java/core/trunk/modules/osgi/pom.xml
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java?rev=1342853&r1=1342852&r2=1342853&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java
Sat May 26 05:00:08 2012
@@ -522,6 +522,11 @@ public class HTTPConstants {
public static final String AUTO_RELEASE_CONNECTION =
"AutoReleaseConnection" ;
/**
+ * Cleanup response
+ */
+public static final String CLEANUP_RESPONSE = "CleanupResponse";
+
+/**
* Method getBytes.
*
* @param data
Modified: axis/axis2/java/core/trunk/modules/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi/pom.xml?rev=1342853&r1=1342852&r2=1342853&view=diff
==
--- axis/axis2/java/core/trunk/modules/osgi/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/osgi/pom.xml Sat May 26 05:00:08 2012
@@ -124,6 +124,8 @@
org.apache.http.impl;resolution:=optional,
org.apache.http.impl.entity;resolution:=optional,
org.apache.http.impl.io;resolution:=optional,
+org.apache.http.impl.auth;resolution:=optional,
+org.apache.http.impl.conn;resolution:=optional,
org.apache.http.io;resolution:=optional,
org.apache.http.message;resolution:=optional,
org.apache.http.params;resolution:=optional,
Modified:
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java?rev=1342853&r1=1342852&r2=1342853&view=diff
==
---
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/impl/httpclient4/HTTPSenderImpl.java
Sat May 26 05:00:08 2012
@@ -50,6 +50,7 @@ import org.apache.http.auth.AuthScope;
import org.apache.http.auth.Credentials;
import org.apache.http.auth.NTCredentials;
import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.auth.params.AuthPNames;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
@@ -58,15 +59,14 @@ import org.apache.http.client.methods.Ht
import org.apache.http.client.params.AuthPolicy;
import org.apache.http.client.params.ClientPNames;
import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.conn.params.ConnManagerPNames;
-import org.apache.http.conn.params.ConnPerRouteBean;
import org.apache.http.conn.scheme.PlainSocketFactory;
import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.scheme.SchemeRegistry;
import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.apache.http.impl.auth.NTLMSchemeFactory;
import org.apache.http.impl.client.AbstractHttpClient;
import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
+import org.apache.http.impl.conn.PoolingClientConnectionManager;
import org.apache.http.message.BasicHeader;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.CoreConnectionPNames;
@@ -75,6 +75,7 @@ import org.apache.http.params.HttpParams
import org.apache.http.protocol.BasicHttpContext;
import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.EntityUtils;
import javax.xml.namespace.QName;
import java.io.IOException;
@@ -142,17 +143,15 @@ public class HTTPSenderImpl extends HTTP
log.trace("HttpResponse expected, but found - " + httpResponse);
