remove obsolete HTTPClient constants for 3.x and 4.x

Author: robertlazarski

modules/transport/http/src/main/java/org/apache/axis2/transport/http/AbstractHTTPTransportSender.java

@@ -495,7 +495,7 @@ private static String findSOAPAction(MessageContext messageContext) {
 
     public void setHTTPClientVersion(ConfigurationContext configurationContext) {
         configurationContext.setProperty(HTTPTransportConstants.HTTP_CLIENT_VERSION,
-                HTTPTransportConstants.HTTP_CLIENT_3_X_VERSION);
+                HTTPTransportConstants.HTTP_CLIENT_5_X_VERSION);
     }
 
 }

modules/transport/http/src/main/java/org/apache/axis2/transport/http/AxisServlet.java

@@ -589,17 +589,10 @@ public void destroy() {
         // AXIS2-4898: MultiThreadedHttpConnectionManager starts a thread that is not stopped by the
         // shutdown of the connection manager. If we want to avoid a resource leak, we need to call
         // shutdownAll here.
-        // TODO - This action need be changed according to current HTTPClient.
-        String clientVersion = getHTTPClientVersion();
-        if (clientVersion != null
-                && HTTPTransportConstants.HTTP_CLIENT_4_X_VERSION.equals(clientVersion)) {
-            // TODO - Handle for HTTPClient 4
-        } else {
-            try {
-                Class.forName("org.apache.commons.httpclient.MultiThreadedHttpConnectionManager").getMethod("shutdownAll").invoke(null);
-            } catch (Exception ex) {
-                log.warn("Failed to shut down MultiThreadedHttpConnectionManager", ex);
-            }
+        try {
+            Class.forName("org.apache.commons.httpclient.MultiThreadedHttpConnectionManager").getMethod("shutdownAll").invoke(null);
+        } catch (Exception ex) {
+            log.error("Failed to shut down MultiThreadedHttpConnectionManager", ex);
         }
 
     }

modules/transport/http/src/main/java/org/apache/axis2/transport/http/HTTPTransportConstants.java

@@ -40,8 +40,7 @@ public class HTTPTransportConstants {
 
     //Settings to define HTTPClient version
     public static final String HTTP_CLIENT_VERSION = "http.client.version"; 
-    public static final String HTTP_CLIENT_3_X_VERSION = "http.client.version.3x";
-    public static final String HTTP_CLIENT_4_X_VERSION = "http.client.version.4x";  
+    public static final String HTTP_CLIENT_5_X_VERSION = "http.client.version.5x";  
 
     public static final String ANONYMOUS = "anonymous";
     public static final String PROXY_HOST_NAME = "proxy_host";

modules/transport/http/src/main/java/org/apache/axis2/transport/http/impl/httpclient5/HTTPClient5TransportSender.java

@@ -63,7 +63,7 @@ public void cleanup(MessageContext msgContext) throws AxisFault {
 
     public void setHTTPClientVersion(ConfigurationContext configurationContext) {
         configurationContext.setProperty(HTTPTransportConstants.HTTP_CLIENT_VERSION,
-                                         HTTPTransportConstants.HTTP_CLIENT_4_X_VERSION);
+                                         HTTPTransportConstants.HTTP_CLIENT_5_X_VERSION);
     }