diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet')
3 files changed, 16 insertions, 20 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSException.java b/base/common/src/com/netscape/cms/servlet/base/CMSException.java index 44a9a23dc..5ceb30ee1 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSException.java +++ b/base/common/src/com/netscape/cms/servlet/base/CMSException.java @@ -161,7 +161,7 @@ public class CMSException extends RuntimeException { return Response .status(exception.getCode()) .entity(exception.getData()) - .type(MediaType.TEXT_XML) + .type(MediaType.APPLICATION_XML) .build(); } } diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CMSErrorInterceptor.java b/base/common/src/com/netscape/cms/servlet/csadmin/CMSErrorInterceptor.java index b751fb091..870422391 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/CMSErrorInterceptor.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/CMSErrorInterceptor.java @@ -38,7 +38,7 @@ public class CMSErrorInterceptor implements ClientErrorInterceptor { String contentType = headers.getFirst("Content-Type"); // handle XML content only - if (!contentType.startsWith(MediaType.TEXT_XML)) + if (contentType == null || !contentType.startsWith(MediaType.APPLICATION_XML)) return; CMSException exception; diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CMSRestClient.java b/base/common/src/com/netscape/cms/servlet/csadmin/CMSRestClient.java index 37db06bd5..ff028660a 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/CMSRestClient.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/CMSRestClient.java @@ -17,12 +17,23 @@ import org.apache.http.conn.scheme.SchemeSocketFactory; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.params.HttpParams; import org.jboss.resteasy.client.ClientExecutor; +import org.jboss.resteasy.client.ProxyFactory; import org.jboss.resteasy.client.core.executors.ApacheHttpClient4Executor; import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; import org.mozilla.jss.ssl.SSLSocket; public abstract class CMSRestClient { + + protected String clientCertNickname; + protected ResteasyProviderFactory providerFactory; + protected ClientExecutor executor; + protected URI uri; + + public CMSRestClient(String baseUri) throws URISyntaxException { + this(baseUri, null); + } + // Callback to approve or deny returned SSL server certs // Right now, simply approve the cert. // ToDO: Look into taking this JSS http client code and move it into @@ -58,25 +69,11 @@ public abstract class CMSRestClient { //For now lets just accept the server cert. This is a test tool, being // pointed at a well know kra instance. - if (servercert != null) { - System.out.println("Peer SSL Servercert details: " + - "\n subject: " + servercert.getSubjectDN().toString() + - "\n issuer: " + servercert.getIssuerDN().toString() + - "\n serial: " + servercert.getSerialNumber().toString() - ); - } - SSLCertificateApprovalCallback.ValidityItem item; Enumeration<?> errors = status.getReasons(); - int i = 0; while (errors.hasMoreElements()) { - i++; item = (SSLCertificateApprovalCallback.ValidityItem) errors.nextElement(); - System.out.println("item " + i + - " reason=" + item.getReason() + - " depth=" + item.getDepth()); - int reason = item.getReason(); if (reason == @@ -168,8 +165,7 @@ public abstract class CMSRestClient { } - protected static String clientCertNickname; - protected ResteasyProviderFactory providerFactory; - protected ClientExecutor executor; - protected URI uri; + public <T> T createProxy(Class<T> clazz) { + return ProxyFactory.create(clazz, uri, executor, providerFactory); + } } |