diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/base')
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/base/BadRequestException.java | 2 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/base/PKIException.java (renamed from base/common/src/com/netscape/cms/servlet/base/CMSException.java) | 26 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/base/PKIService.java | 6 | ||||
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/base/UnauthorizedException.java | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/base/BadRequestException.java b/base/common/src/com/netscape/cms/servlet/base/BadRequestException.java index b5c5e0b12..cefa26985 100644 --- a/base/common/src/com/netscape/cms/servlet/base/BadRequestException.java +++ b/base/common/src/com/netscape/cms/servlet/base/BadRequestException.java @@ -18,7 +18,7 @@ package com.netscape.cms.servlet.base; import javax.ws.rs.core.Response; -public class BadRequestException extends CMSException { +public class BadRequestException extends PKIException { private static final long serialVersionUID = -4784839378360933483L; diff --git a/base/common/src/com/netscape/cms/servlet/base/CMSException.java b/base/common/src/com/netscape/cms/servlet/base/PKIException.java index 5ceb30ee1..be2629e17 100644 --- a/base/common/src/com/netscape/cms/servlet/base/CMSException.java +++ b/base/common/src/com/netscape/cms/servlet/base/PKIException.java @@ -35,43 +35,43 @@ import javax.xml.bind.annotation.XmlValue; import javax.xml.bind.annotation.adapters.XmlAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -public class CMSException extends RuntimeException { +public class PKIException extends RuntimeException { private static final long serialVersionUID = 6000910362260369923L; public int code; - public CMSException(String message) { + public PKIException(String message) { super(message); code = Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(); } - public CMSException(int code, String message) { + public PKIException(int code, String message) { super(message); this.code = code; } - public CMSException(Response.Status status, String message) { + public PKIException(Response.Status status, String message) { super(message); code = status.getStatusCode(); } - public CMSException(String message, Throwable cause) { + public PKIException(String message, Throwable cause) { super(message, cause); code = Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(); } - public CMSException(int code, String message, Throwable cause) { + public PKIException(int code, String message, Throwable cause) { super(message, cause); this.code = code; } - public CMSException(Response.Status status, String message, Throwable cause) { + public PKIException(Response.Status status, String message, Throwable cause) { super(message, cause); code = status.getStatusCode(); } - public CMSException(Data data) { + public PKIException(Data data) { super(data.message); code = data.code; } @@ -92,7 +92,7 @@ public class CMSException extends RuntimeException { return data; } - @XmlRootElement(name="CMSException") + @XmlRootElement(name="PKIException") public static class Data { @XmlElement(name="ClassName") @@ -154,10 +154,10 @@ public class CMSException extends RuntimeException { } @Provider - public static class Mapper implements ExceptionMapper<CMSException> { + public static class Mapper implements ExceptionMapper<PKIException> { - public Response toResponse(CMSException exception) { - // convert CMSException into HTTP response with XML content + public Response toResponse(PKIException exception) { + // convert PKIException into HTTP response with XML content return Response .status(exception.getCode()) .entity(exception.getData()) @@ -168,7 +168,7 @@ public class CMSException extends RuntimeException { public static void main(String args[]) throws Exception { Data data = new Data(); - data.className = CMSException.class.getName(); + data.className = PKIException.class.getName(); data.code = Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(); data.message = "An error has occured"; data.setAttribute("attr1", "value1"); diff --git a/base/common/src/com/netscape/cms/servlet/base/PKIService.java b/base/common/src/com/netscape/cms/servlet/base/PKIService.java index de92d290a..a77846c68 100644 --- a/base/common/src/com/netscape/cms/servlet/base/PKIService.java +++ b/base/common/src/com/netscape/cms/servlet/base/PKIService.java @@ -38,7 +38,7 @@ import javax.ws.rs.core.UriInfo; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.logging.IAuditor; import com.netscape.certsrv.logging.ILogger; -import com.netscape.cms.servlet.cert.model.CertificateData; +import com.netscape.cms.servlet.cert.model.CertData; /** * Base class for CMS RESTful resources @@ -90,9 +90,9 @@ public class PKIService { return builder.build(); } - public CertificateData createCertificateData(org.mozilla.jss.crypto.X509Certificate cert) + public CertData createCertificateData(org.mozilla.jss.crypto.X509Certificate cert) throws CertificateEncodingException { - CertificateData data = new CertificateData(); + CertData data = new CertData(); String b64 = HEADER + CMS.BtoA(cert.getEncoded()) + TRAILER; data.setEncoded(b64); return data; diff --git a/base/common/src/com/netscape/cms/servlet/base/UnauthorizedException.java b/base/common/src/com/netscape/cms/servlet/base/UnauthorizedException.java index 7dfa3d6d4..83803601c 100644 --- a/base/common/src/com/netscape/cms/servlet/base/UnauthorizedException.java +++ b/base/common/src/com/netscape/cms/servlet/base/UnauthorizedException.java @@ -23,7 +23,7 @@ import javax.ws.rs.core.Response; /** * @author Endi S. Dewata */ -public class UnauthorizedException extends CMSException { +public class UnauthorizedException extends PKIException { private static final long serialVersionUID = -2025082875126996556L; |