Revert "Replaced deprecated DefaultHttpClient."

Commit db58e6071f6bb57de006e6499c0a0c6a8c8e67bf has been reverted
due to build issue on RHEL/CentOS.

https://fedorahosted.org/pki/ticket/2531

3 files changed, 30 insertions, 12 deletions

diff --git a/base/common/src/com/netscape/certsrv/client/SubsystemClient.java b/base/common/src/com/netscape/certsrv/client/SubsystemClient.java
index bf329afcb..3d44bce41 100644
--- a/base/common/src/com/netscape/certsrv/client/SubsystemClient.java
+++ b/base/common/src/com/netscape/certsrv/client/SubsystemClient.java
@@ -17,9 +17,12 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.certsrv.client;
 
+import java.net.URI;
 import java.net.URISyntaxException;
 
-import javax.ws.rs.core.Response;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
 
 import com.netscape.certsrv.account.AccountClient;
 
@@ -48,12 +51,23 @@ public class SubsystemClient extends Client {
 
     public boolean exists() throws Exception {
 
+        ClientConfig config = client.getConfig();
+        URI serverURI = config.getServerURI();
 
-        PKIConnection connection = client.getConnection();
-        Response response = connection.get("/" + name);
+        URI subsystemURI = new URI(
+                serverURI.getScheme(),
+                null,
+                serverURI.getHost(),
+                serverURI.getPort(),
+                "/" + name,
+                null,
+                null);
 
+        DefaultHttpClient client = new DefaultHttpClient();
+        HttpGet method = new HttpGet(subsystemURI);
         try {
-            int code = response.getStatus();
+            HttpResponse response = client.execute(method);
+            int code = response.getStatusLine().getStatusCode();
 
             if (code == 200) {
                 return true;
@@ -62,11 +76,11 @@ public class SubsystemClient extends Client {
                 return false;
 
             } else {
-                throw new Exception("Error: " + response.getStatusInfo());
+                throw new Exception("Error: " + response.getStatusLine());
             }
 
         } finally {
-            response.close();
+            method.releaseConnection();
         }
     }
 
diff --git a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
index 6044b7aac..5d401f396 100644
--- a/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
+++ b/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
@@ -38,8 +38,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.util.EntityUtils;
 import org.mozilla.jss.CryptoManager;
 import org.mozilla.jss.asn1.ASN1Util;
@@ -743,8 +742,9 @@ public class CRMFPopClient {
 
         if (verbose) System.out.println("Opening " + url);
 
+        DefaultHttpClient client = new DefaultHttpClient();
         HttpGet method = new HttpGet(url);
-        try (CloseableHttpClient client = HttpClientBuilder.create().build()) {
+        try {
             HttpResponse response = client.execute(method);
 
             if (response.getStatusLine().getStatusCode() != 200) {
diff --git a/base/util/src/com/netscape/cmsutil/ocsp/OCSPProcessor.java b/base/util/src/com/netscape/cmsutil/ocsp/OCSPProcessor.java
index 1c4917ce9..3b721304c 100644
--- a/base/util/src/com/netscape/cmsutil/ocsp/OCSPProcessor.java
+++ b/base/util/src/com/netscape/cmsutil/ocsp/OCSPProcessor.java
@@ -25,11 +25,11 @@ import java.security.MessageDigest;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.entity.ContentType;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.util.EntityUtils;
 import org.mozilla.jss.CryptoManager;
 import org.mozilla.jss.asn1.INTEGER;
@@ -126,8 +126,9 @@ public class OCSPProcessor {
 
         if (verbose) System.out.println("URL: " + url);
 
-        try (CloseableHttpClient httpClient = HttpClientBuilder.create().build()) {
+        HttpClient httpClient = new DefaultHttpClient();
 
+        try {
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             request.encode(os);
             byte[] requestData = os.toByteArray();
@@ -161,6 +162,9 @@ public class OCSPProcessor {
             } finally {
                 EntityUtils.consume(responseEntity);
             }
+
+        } finally {
+            httpClient.getConnectionManager().shutdown();
         }
     }
 }