Removed hard-coded response type.

Previously some methods were hard-coded to return XML responses.
The code has been removed to allow clients to request a different
format.

Ticket #554

3 files changed, 0 insertions, 11 deletions

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) {