Author: sagara
Date: Tue May 22 10:13:41 2012
New Revision: 1341387
URL: http://svn.apache.org/viewvc?rev=1341387&view=rev
Log:
Further modifications according to AXIS2-4318 changes.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java
axis/axis2/java/core/trunk/modules/osgi/pom.xml
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java?rev=1341387&r1=1341386&r2=1341387&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/core/controller/impl/AxisInvocationController.java
Tue May 22 10:13:41 2012
@@ -49,6 +49,7 @@ import org.apache.axis2.jaxws.util.Const
import org.apache.axis2.jaxws.utility.ClassUtils;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.transport.http.HttpTransportProperties;
+import
org.apache.axis2.transport.http.impl.httpclient3.HttpTransportPropertiesImpl;
import org.apache.axis2.util.ThreadContextMigratorUtil;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
@@ -522,8 +523,8 @@ public class AxisInvocationController ex
throw ExceptionFactory.makeWebServiceException(e);
}
- HttpTransportProperties.Authenticator basicAuthentication =
- new HttpTransportProperties.Authenticator();
+ HttpTransportPropertiesImpl.Authenticator basicAuthentication =
+ new HttpTransportPropertiesImpl.Authenticator();
basicAuthentication.setUsername(userId);
basicAuthentication.setPassword(password);
basicAuthentication.setHost(url.getHost());
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=1341387&r1=1341386&r2=1341387&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/osgi/pom.xml Tue May 22 10:13:41 2012
@@ -135,6 +135,14 @@
org.w3c.dom;resolution:=optional,
org.w3c.dom.traversal;resolution:=optional,
org.xml.sax;resolution:=optional,
+ org.apache.http.client.*,
+ org.apache.http.auth;resolution:=optional,
+ org.apache.http.conn;resolution:=optional,
+ org.apache.http.conn.params;resolution:=optional,
+ org.apache.http.conn.scheme;resolution:=optional,
+ org.apache.http.conn.ssl;resolution:=optional,
+ org.apache.http.impl.client;resolution:=optional,
+
org.apache.http.impl.conn.tsccm;resolution:=optional
</Import-Package>
<Private-Package>
org.apache.axis2.osgi.internal,
