Revision 9095
Added by ben leinfelder almost 10 years ago
src/edu/ucsb/nceas/metacat/replication/ReplicationService.java | ||
---|---|---|
66 | 66 |
import org.apache.http.conn.ssl.SSLSocketFactory; |
67 | 67 |
import org.apache.log4j.Logger; |
68 | 68 |
import org.dataone.client.rest.DefaultHttpMultipartRestClient; |
69 |
import org.dataone.client.rest.HttpMultipartRestClient; |
|
69 | 70 |
import org.dataone.client.rest.RestClient; |
70 | 71 |
import org.dataone.client.auth.CertificateManager; |
71 | 72 |
import org.dataone.service.types.v1.Identifier; |
... | ... | |
2290 | 2291 |
logReplication.info("Getting url stream from " + u.toString()); |
2291 | 2292 |
logReplication.info("ReplicationService.getURLStream - Before sending request to: " + u.toString()); |
2292 | 2293 |
// use httpclient to set up SSL |
2293 |
DefaultHttpMultipartRestClient client = getSSLClient();
|
|
2294 |
HttpMultipartRestClient client = getSSLClient(); |
|
2294 | 2295 |
// get the response content |
2295 | 2296 |
InputStream input = client.doGetRequest(u.toString(), CLIENTTIMEOUT); |
2296 | 2297 |
logReplication.info("ReplicationService.getURLStream - After getting response from: " + u.toString()); |
... | ... | |
2315 | 2316 |
* Sends client certificate to the server when doing the request. |
2316 | 2317 |
* @return |
2317 | 2318 |
*/ |
2318 |
private static DefaultHttpMultipartRestClient getSSLClient() {
|
|
2319 |
DefaultHttpMultipartRestClient client = new DefaultHttpMultipartRestClient();
|
|
2319 |
private static HttpMultipartRestClient getSSLClient() { |
|
2320 |
HttpMultipartRestClient client = new HttpMultipartRestClient();
|
|
2320 | 2321 |
|
2321 | 2322 |
// set up this server's client identity |
2322 | 2323 |
String subject = null; |
Also available in: Unified diff
use HttpMultipartRestClient since the DefaultHttpMultipartRestClient was removed from d1_libclient_java