does order matter for jax-rs resources?

fcrepo · Mar 14, 2013 · ff0e6d6 · ff0e6d6
1 parent b22a74c
commit ff0e6d6
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraRepository.java b/fcrepo-http-api/src/main/java/org/fcrepo/api/FedoraRepository.java
@@ -80,11 +80,11 @@ public Response describeModeshape() throws JsonGenerationException,
         session.logout();
         return ok(repoproperties.build().toString()).build();
     }
-    
+
     @GET
     @Path("/describe")
-    @Produces(TEXT_HTML)
-    public String describeHtml() throws LoginException,
+    @Produces({TEXT_XML, APPLICATION_JSON})
+    public DescribeRepository describe() throws LoginException,
             RepositoryException {
 
         Session session = repo.login();
@@ -97,14 +97,14 @@ public String describeHtml() throws LoginException,
         description.numberOfObjects =
                 session.getNode("/objects").getNodes().getSize();
         session.logout();
-        VelocityViewer view = new VelocityViewer();
-        return view.getRepoInfo(description);
+        return description;
     }
 
+
     @GET
     @Path("/describe")
-    @Produces({TEXT_XML, APPLICATION_JSON})
-    public DescribeRepository describe() throws LoginException,
+    @Produces(TEXT_HTML)
+    public String describeHtml() throws LoginException,
             RepositoryException {
 
         Session session = repo.login();
@@ -117,7 +117,8 @@ public DescribeRepository describe() throws LoginException,
         description.numberOfObjects =
                 session.getNode("/objects").getNodes().getSize();
         session.logout();
-        return description;
+        VelocityViewer view = new VelocityViewer();
+        return view.getRepoInfo(description);
     }
 
 }