also return XML

2 files changed, 6 insertions, 6 deletions

diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java b/proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java
index 2f17258..3994cbc 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java
@@ -42,14 +42,14 @@ public abstract class BaseApi {
     private static final Logger log = Logger.getLogger(BaseApi.class);
 
     @GET @Path("/{uuid}")
-    @Produces(MediaType.APPLICATION_JSON)
+    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public Object get(@PathParam("uuid") String uuid) {
         Object o = ObjectFactory.get().lookupByUUID(getApiClass(), uuid);
         return o;
     }
 
     @GET @Path("/list")
-    @Produces(MediaType.APPLICATION_JSON)
+    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public String list() {
         StringBuffer retval = new StringBuffer();
         List objects =  ObjectFactory.get().listObjectsByClass(getApiClass());
@@ -63,7 +63,7 @@ public abstract class BaseApi {
 
     @POST
     @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_FORM_URLENCODED})
-    @Produces(MediaType.APPLICATION_JSON)
+    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public Object create(Form form) {
         String newuuid = BaseModel.generateUUID();
         Object args[] = new Object[1];
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/UserApi.java b/proxy/code/src/org/fedoraproject/candlepin/api/UserApi.java
index 94e6c77..34949c0 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/UserApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/api/UserApi.java
@@ -35,7 +35,7 @@ import javax.ws.rs.core.MediaType;
 @Path("/user")
 public class UserApi extends BaseApi {
     @GET @Path("/{login}")
-    @Produces(MediaType.APPLICATION_JSON)
+    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public User get(@PathParam("login") String login) {
         return (User) ObjectFactory.get().lookupByFieldName(User.class, "login", login);
     }
@@ -53,7 +53,7 @@ public class UserApi extends BaseApi {
      * model type
      */
     @GET @Path("/listusers")
-    @Produces(MediaType.APPLICATION_JSON)
+    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public Users listUsers() {
         List<Object> objects = ObjectFactory.get().listObjectsByClass(getApiClass());
         Users users = new Users();
@@ -69,7 +69,7 @@ public class UserApi extends BaseApi {
      * have its own list method
      */
     @GET @Path("/uselist")
-    @Produces(MediaType.APPLICATION_JSON)
+    @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
     public List<User> listUsers1() {
         List<Object> u = ObjectFactory.get().listObjectsByClass(getApiClass());
         List<User> users = new ArrayList<User>();