diff options
14 files changed, 7 insertions, 49 deletions
diff --git a/base/common/src/com/netscape/certsrv/base/PKIException.java b/base/common/src/com/netscape/certsrv/base/PKIException.java index f1f377352..74e13c747 100644 --- a/base/common/src/com/netscape/certsrv/base/PKIException.java +++ b/base/common/src/com/netscape/certsrv/base/PKIException.java @@ -17,7 +17,11 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.base; -import javax.ws.rs.core.MediaType; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; @@ -97,11 +101,10 @@ public class PKIException extends RuntimeException { public static class Mapper implements ExceptionMapper<PKIException> { public Response toResponse(PKIException exception) { - // convert PKIException into HTTP response with XML content + // convert PKIException into HTTP response return Response .status(exception.getCode()) .entity(exception.getData()) - .type(MediaType.APPLICATION_XML) .build(); } } diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java index b38277dd0..429fbea17 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java @@ -23,7 +23,6 @@ import java.util.Enumeration; import java.util.Locale; import java.util.Map; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; @@ -245,7 +244,6 @@ public class GroupMemberProcessor extends Processor { return Response .created(groupMemberData.getLink().getHref()) .entity(groupMemberData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java index 722979d79..4998212d5 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupService.java @@ -26,7 +26,6 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; @@ -223,7 +222,6 @@ public class GroupService extends PKIService implements GroupResource { return Response .created(groupData.getLink().getHref()) .entity(groupData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { @@ -286,7 +284,6 @@ public class GroupService extends PKIService implements GroupResource { return Response .ok(groupData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/UserService.java b/base/server/cms/src/com/netscape/cms/servlet/admin/UserService.java index 265fe3e1b..130103a87 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/UserService.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/UserService.java @@ -35,7 +35,6 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; @@ -366,7 +365,6 @@ public class UserService extends PKIService implements UserResource { return Response .created(userData.getLink().getHref()) .entity(userData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { @@ -445,7 +443,6 @@ public class UserService extends PKIService implements UserResource { return Response .ok(userData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { @@ -537,7 +534,6 @@ public class UserService extends PKIService implements UserResource { return Response .ok(userData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { @@ -927,7 +923,6 @@ public class UserService extends PKIService implements UserResource { return Response .created(userCertData.getLink().getHref()) .entity(userCertData) - .type(MediaType.APPLICATION_XML) .build(); } catch (CertificateExpiredException e) { @@ -1117,7 +1112,6 @@ public class UserService extends PKIService implements UserResource { return Response .created(userMembershipData.getLink().getHref()) .entity(userMembershipData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { diff --git a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileService.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileService.java index 02840451c..fe80892d7 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileService.java +++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileService.java @@ -34,7 +34,6 @@ import javax.servlet.http.HttpServletRequest; import javax.ws.rs.PathParam; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriBuilder; @@ -504,7 +503,6 @@ public class ProfileService extends PKIService implements ProfileResource { return Response .created(profileData.getLink().getHref()) .entity(profileData) - .type(MediaType.APPLICATION_XML) .build(); } catch (EBaseException | IOException e) { @@ -551,7 +549,6 @@ public class ProfileService extends PKIService implements ProfileResource { ProfileData profileData = createProfileData(profileId); return Response .ok(profileData) - .type(MediaType.APPLICATION_XML) .build(); } catch (EBaseException e) { CMS.debug("modifyProfile: error obtaining profile `" + profileId + "`: " + e); diff --git a/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java b/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java index c919f10ea..de17c8a96 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java +++ b/base/server/cms/src/com/netscape/cms/servlet/request/KeyRequestService.java @@ -29,7 +29,6 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; @@ -185,7 +184,6 @@ public class KeyRequestService extends PKIService implements KeyRequestResource return Response .created(new URI(response.getRequestInfo().getRequestURL())) .entity(response) - .type(MediaType.APPLICATION_XML) .build(); } catch (EBaseException | URISyntaxException e) { e.printStackTrace(); @@ -221,7 +219,6 @@ public class KeyRequestService extends PKIService implements KeyRequestResource return Response .created(new URI(response.getRequestInfo().getRequestURL())) .entity(response) - .type(MediaType.APPLICATION_XML) .build(); } catch (EBaseException | URISyntaxException e) { e.printStackTrace(); @@ -458,12 +455,11 @@ public class KeyRequestService extends PKIService implements KeyRequestResource return Response .created(new URI(response.getRequestInfo().getRequestURL())) .entity(response) - .type(MediaType.APPLICATION_XML) .build(); } catch (EBaseException | URISyntaxException e) { e.printStackTrace(); auditArchivalRequestMade(null, ILogger.FAILURE, data.getClientId()); throw new PKIException(e.toString()); } - } + } } diff --git a/base/server/cms/src/com/netscape/cms/servlet/tks/TPSConnectorService.java b/base/server/cms/src/com/netscape/cms/servlet/tks/TPSConnectorService.java index 28e3dbb7d..197fbb8f9 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/tks/TPSConnectorService.java +++ b/base/server/cms/src/com/netscape/cms/servlet/tks/TPSConnectorService.java @@ -13,7 +13,6 @@ import java.util.TreeSet; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; @@ -170,7 +169,6 @@ public class TPSConnectorService implements TPSConnectorResource { return Response .created(newData.getLink().getHref()) .entity(newData) - .type(MediaType.APPLICATION_XML) .build(); } catch (EBaseException e) { @@ -211,7 +209,6 @@ public class TPSConnectorService implements TPSConnectorResource { return Response .ok(curData.getLink().getHref()) .entity(curData) - .type(MediaType.APPLICATION_XML) .build(); } catch (EBaseException e) { CMS.debug("Unable to modify TPS Connector: " + e); diff --git a/base/server/cmscore/src/com/netscape/cmscore/logging/AuditService.java b/base/server/cmscore/src/com/netscape/cmscore/logging/AuditService.java index 1d07114b1..e34bbfc78 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/logging/AuditService.java +++ b/base/server/cmscore/src/com/netscape/cmscore/logging/AuditService.java @@ -26,7 +26,6 @@ import java.util.LinkedHashSet; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; @@ -166,7 +165,6 @@ public class AuditService extends PKIService implements AuditResource { return Response .ok(auditConfig) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorService.java index 47edf2320..8a0277927 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/authenticator/AuthenticatorService.java @@ -27,7 +27,6 @@ import java.util.Iterator; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; @@ -182,7 +181,6 @@ public class AuthenticatorService extends PKIService implements AuthenticatorRes return Response .created(authenticatorData.getLink().getHref()) .entity(authenticatorData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { @@ -231,7 +229,6 @@ public class AuthenticatorService extends PKIService implements AuthenticatorRes return Response .ok(authenticatorData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { @@ -292,7 +289,6 @@ public class AuthenticatorService extends PKIService implements AuthenticatorRes return Response .ok(authenticatorData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConfigService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConfigService.java index b470cf879..9b10bbc8e 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConfigService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/config/ConfigService.java @@ -25,7 +25,6 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; @@ -122,7 +121,6 @@ public class ConfigService extends PKIService implements ConfigResource { return Response .ok(configData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionService.java index 85c64f31d..93187a775 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/connection/ConnectionService.java @@ -27,7 +27,6 @@ import java.util.Iterator; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; @@ -182,7 +181,6 @@ public class ConnectionService extends PKIService implements ConnectionResource return Response .created(connectionData.getLink().getHref()) .entity(connectionData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { @@ -231,7 +229,6 @@ public class ConnectionService extends PKIService implements ConnectionResource return Response .ok(connectionData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { @@ -292,7 +289,6 @@ public class ConnectionService extends PKIService implements ConnectionResource return Response .ok(connectionData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingService.java index e9ff801b0..cd43bb9c3 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileMappingService.java @@ -27,7 +27,6 @@ import java.util.Iterator; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; @@ -178,7 +177,6 @@ public class ProfileMappingService extends PKIService implements ProfileMappingR return Response .created(profileMappingData.getLink().getHref()) .entity(profileMappingData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { @@ -224,7 +222,6 @@ public class ProfileMappingService extends PKIService implements ProfileMappingR return Response .ok(profileMappingData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { @@ -285,7 +282,6 @@ public class ProfileMappingService extends PKIService implements ProfileMappingR return Response .ok(profileMappingData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileService.java index 5ecd1c82c..543efb400 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/profile/ProfileService.java @@ -27,7 +27,6 @@ import java.util.Iterator; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; @@ -183,7 +182,6 @@ public class ProfileService extends PKIService implements ProfileResource { return Response .created(profileData.getLink().getHref()) .entity(profileData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { @@ -232,7 +230,6 @@ public class ProfileService extends PKIService implements ProfileResource { return Response .ok(profileData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { @@ -293,7 +290,6 @@ public class ProfileService extends PKIService implements ProfileResource { return Response .ok(profileData) - .type(MediaType.APPLICATION_XML) .build(); } catch (PKIException e) { diff --git a/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenService.java b/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenService.java index 27291cf7f..361fc29ec 100644 --- a/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenService.java +++ b/base/tps-tomcat/src/org/dogtagpki/server/tps/token/TokenService.java @@ -26,7 +26,6 @@ import java.util.Iterator; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; @@ -191,7 +190,6 @@ public class TokenService extends PKIService implements TokenResource { return Response .created(tokenData.getLink().getHref()) .entity(tokenData) - .type(MediaType.APPLICATION_XML) .build(); } catch (Exception e) { @@ -220,7 +218,6 @@ public class TokenService extends PKIService implements TokenResource { return Response .ok(tokenData) - .type(MediaType.APPLICATION_XML) .build(); } catch (Exception e) { @@ -254,7 +251,6 @@ public class TokenService extends PKIService implements TokenResource { return Response .ok(tokenData) - .type(MediaType.APPLICATION_XML) .build(); } catch (Exception e) { |